Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2011-04-07 09:42:13 -07:00

parent 7e3bf1d330 da60325d83

commit 2b9accbee5

8 changed files with 36 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

13

drivers/hid/Kconfig

View file

2

drivers/hid/hid-core.c

View file

4

drivers/hid/hid-ids.h

View file

2

drivers/hid/hid-lgff.c

View file

2

drivers/hid/hid-magicmouse.c

View file

16

drivers/hid/hid-ortek.c

View file

3

drivers/hid/hid-roccat-pyra.c

View file

1

drivers/hid/usbhid/hid-quirks.c

View file