diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-27 11:18:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-27 11:18:43 -0700 |
commit | f8966048c128eff4f57f7c9e7f71360ebd10e1a9 (patch) | |
tree | d8dfba60c63c9bc9c2e22cff65120c13d851dc26 /arch/x86 | |
parent | a8c45289f215e137825bf9630d0abb41c1dc41ff (diff) | |
parent | 4c43755506ececbe903585265aa8408e937620a1 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- fix for potential 3.9 regression in handling of buttons for touchpads
following HID mt specification; potential because reportedly there is
no retail product on the market that would be using this feature, but
nevertheless we'd better follow the spec. Fix by Benjamin Tissoires.
- support for two quirky devices added by Josh Boyer.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: multitouch: fix touchpad buttons
HID: usbhid: fix build problem
HID: usbhid: quirk for MSI GX680R led panel
HID: usbhid: quirk for Realtek Multi-card reader
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions