Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
commit9b4d142d521963ee1c53cefcd1f9790ca32b5db7
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2009 02:11:02 +0000 (29 18:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2009 02:11:02 +0000 (29 18:11 -0800)
tree2f302aa25a5b1209932335110f9e5138dd95d824
parent6e3eed9850064e38a98851ff91534bb32438b292
parentbae7eb33b25387fdc7ccae08768bef1f9484a5b0
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

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