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: document difference between hid_blacklist and hid_ignore_list
  HID: add antec-branded soundgraph imon devices to blacklist
  HID: fix reversed logic in disconnect testing of hiddev
  HID: adjust report descriptor fixup for MS 1028 receiver

...

This commit is contained in:

Linus Torvalds 2009-01-29 18:11:02 -08:00

parent 6e3eed9850 bae7eb33b2

commit 9b4d142d52

4 changed files with 11 additions and 10 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

4

drivers/hid/hid-core.c

View file

2

drivers/hid/hid-ids.h

View file

13

drivers/hid/hid-microsoft.c

View file

2

drivers/hid/usbhid/hiddev.c

View file