]> git.baikalelectronics.ru Git - kernel.git/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)
commit9ff173626dfdbb57bb2b3b255e7f62883cf14a7b
tree4cf42cdfd0f7bccda990d94b4f00aa3beebc186f
parentf74a61d932bb876fafc613d012242d7e68204457
parent0002ddd7a928ad5025645573c2c29e56dd6efdb6
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