diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 22:45:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 22:45:49 +0200 |
| commit | b322b7816908487c08b89b72f838174c37d8c836 (patch) | |
| tree | 8fde3f20bf6fb97b91fd3f88e032251f0c569d00 /drivers/s390/cio/Makefile | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | Merge branches 'upstream' and 'ntrig-multitouch' into for-linus (diff) | |
| download | linux-b322b7816908487c08b89b72f838174c37d8c836.tar.xz linux-b322b7816908487c08b89b72f838174c37d8c836.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: fix inverted wheel for bluetooth version of apple mighty mouse
HID: no more reinitializtion is needed in post_reset
HID: hidraw -- fix comment about accepted devices
HID: Multitouch support for the N-Trig touchscreen
HID: add new multitouch and digitizer contants
HID: autocentering support for Logitech Force 3D Pro
HID: fix hid-ff drivers so that devices work even without ff support
HID: force feedback support for SmartJoy PLUS PS2/USB adapter
HID: Wacom Graphire Bluetooth driver
HID: autocentering support for Logitech G25 Racing Wheel
Diffstat (limited to 'drivers/s390/cio/Makefile')
0 files changed, 0 insertions, 0 deletions