diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 10:31:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 10:31:34 -0700 |
| commit | b81fd5ba6002306f0c2bf82514b2eeae6ee2bf32 (patch) | |
| tree | 0a4c644b9bf000afa28f443d22b6e0e8aea21928 /include/uapi/linux/input.h | |
| parent | Merge tag 'sound-3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
| parent | HID: core: do not scan constant input report (diff) | |
| download | linux-dev-b81fd5ba6002306f0c2bf82514b2eeae6ee2bf32.tar.xz linux-dev-b81fd5ba6002306f0c2bf82514b2eeae6ee2bf32.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- fix for merge window mismerge in hid-sony, from Frank Praznik
- fix for Surface Type/Touch Cover 2 device, from Benjamin Tissoires
- quirk for ThinkPad Helix sensor hub from Stephen Chandler Paul
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: core: do not scan constant input report
Revert "HID: microsoft: Add ID's for Surface Type/Touch Cover 2"
HID: sensor-hub: add sensor hub quirk for ThinkPad Helix
HID: sony: Fix cancel_work_sync mismerge
Diffstat (limited to 'include/uapi/linux/input.h')
0 files changed, 0 insertions, 0 deletions