]> err.no Git - linux-2.6/commit
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 7 Mar 2007 01:34:28 +0000 (17:34 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 7 Mar 2007 01:34:28 +0000 (17:34 -0800)
commit7c368bb1049bde17fc4f8655492478d7f2918da9
tree4cf42cdfd0f7bccda990d94b4f00aa3beebc186f
parentcba5a641ca7887dc371486681dac887869d1c7b7
parent5ddc3229488f4cad719f47aecfa1459ebbbde5b3
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
  HID blacklisting of all Code Mercenaries IOWarrior devices
drivers/usb/input/hid-core.c