]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bca39da f8dea7a)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 15:16:25 +0000 (08:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 15:16:25 +0000 (08:16 -0700)
commit424de91dd6163808729d7082de55c319e1096bee
treee75369227a1614dda3f5f37739b9c07bb847b785tree | snapshot
parentbca39da5645c72048e8854340575c338b8100bcacommit | diff
parentf8dea7a3d47ee7c857965b22e33229e7de410a88commit | diff
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: remove CVS keywords
  HID: Add iMON LCDs to blacklist
  HID: add Microchip PICKit 1 and PICkit 2 to blacklist
  HID: split Numlock emulation quirk from HID_QUIRK_APPLE_HAS_FN.
Linux 2.6 source tree