Commits
Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into for-linus Conflicts: drivers/hid/Kconfig
Showing diff to89759e20d95
Jiri Kosina committed 72c16d9a5c3MMerge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus Conflicts: drivers/hid/hi...
Stefan Achatz committed b42065f3170HID: roccat: added media key support for Kone Kone now reports media key events throug...
Adam Jiang committed 89759e20d95HID: Add PID for Japanese version of NE4K keyboard This patche adds PID of Japanese Na...