Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 May 2009 00:12:54 +0000 (17:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 May 2009 00:12:54 +0000 (17:12 -0700)
commita4f1cb9f3c42e5d278b0678ed5225d9331a8dcff
tree96f69bddb4952e64fffe02e677e9b41c1483d88f
parentbd99f5e17b317a6d342ffaf500e2a9fd632d2a22
parentb820aabf6cb987fd03d85b0b5f599685051e0426
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: add NOGET quirk for devices from CH Products
  HID: fix dropped device-specific quirks