diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-29 19:52:35 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-29 19:52:35 +0100 |
| commit | 7f474df0a7b7dadfc01ba778460a91f554ca1481 (patch) | |
| tree | 836580777625aa1b47d4bbc10c0a37f33c14bc61 /drivers/mtd/maps/pcmciamtd.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| parent | HID: input: Fix TransducerSerialNumber implementation (diff) | |
| download | linux-7f474df0a7b7dadfc01ba778460a91f554ca1481.tar.xz linux-7f474df0a7b7dadfc01ba778460a91f554ca1481.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- workarounds for a couple of misbehaving Elan Touchscreens, by Adel
Gadllah
- fix for TransducerSerialNumber field implementation, by Jason Gerecke
- a couple of new HID usages (added by HUT), by Olivier Gay
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: input: Fix TransducerSerialNumber implementation
HID: add keyboard input assist hid usages
HID: usbhid: enable always-poll quirk for Elan Touchscreen 016f
HID: usbhid: enable always-poll quirk for Elan Touchscreen 009b
Diffstat (limited to 'drivers/mtd/maps/pcmciamtd.c')
0 files changed, 0 insertions, 0 deletions