| commit | 424de91dd6163808729d7082de55c319e1096bee | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 20 08:16:25 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 20 08:16:25 2008 -0700 |
| tree | e75369227a1614dda3f5f37739b9c07bb847b785 | |
| parent | bca39da5645c72048e8854340575c338b8100bca [diff] | |
| parent | f8dea7a3d47ee7c857965b22e33229e7de410a88 [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.