Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 18:26:53 +0000 (11:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 18:26:53 +0000 (11:26 -0700)
commit65ae24b1811650f2bc5b0b85ea8b0bff6b5bf4a9
tree45598ae09230cb7c380997dfe61757ca3a8b9fb4
parentcb23832e3987a02428a274c8f259336f706b17e9
parent24c88eb671b437d700fbfa7aa79adeb9690db1eb
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: blacklist additional SoundGraph iMon LCD models
  HID: fix/improve help texts for quirk drivers
  HID: fix default building of HID-quirk drivers