From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Oct 2008 18:26:53 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v2.6.28-rc1~291
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=65ae24b1811650f2bc5b0b85ea8b0bff6b5bf4a9;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

65ae24b1811650f2bc5b0b85ea8b0bff6b5bf4a9