diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-29 11:52:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-29 11:52:35 -0700 |
commit | 7f474df0a7b7dadfc01ba778460a91f554ca1481 (patch) | |
tree | 836580777625aa1b47d4bbc10c0a37f33c14bc61 /fs/buffer.c | |
parent | 8c782932138e477fa352c5c7cfa1e3d2361e1351 (diff) | |
parent | 5989a55a4c9aafba8b152c6bf52244510c2b88b9 (diff) | |
download | op-kernel-dev-7f474df0a7b7dadfc01ba778460a91f554ca1481.zip op-kernel-dev-7f474df0a7b7dadfc01ba778460a91f554ca1481.tar.gz |
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 'fs/buffer.c')
0 files changed, 0 insertions, 0 deletions