| commit | 2b9accbee563f535046ff2cd382d0acaa92e130c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 07 09:42:13 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 07 09:42:13 2011 -0700 |
| tree | 61fbaf607377878396116a40d7354a06c691dd86 | |
| parent | 7e3bf1d3308934bc1b8ca492f473e0e22a95da7e [diff] | |
| parent | da60325d83867849543b48a317bf2f8d4faebfb4 [diff] |
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: Add support for CH Pro Throttle HID: hid-magicmouse: Increase evdev buffer size HID: add FF support for Logitech G25/G27 HID: roccat: Add support for wireless variant of Pyra HID: Fix typo Keyoutch -> Keytouch HID: add support for Skycable 0x3f07 wireless presenter