]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita12c7a7d88c8dd1a4fc7b05e9cda15e38a572b8e
treee75369227a1614dda3f5f37739b9c07bb847b785
parentc1f11cc832eb9329e4c857213cf3fae4e36c4e7e
parent5e37614ff25f036f6e9416f06e88c4209db1163a
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.