diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-18 10:42:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-18 10:42:19 -0700 |
| commit | e63c733d03070d4d3aaf3a29775b42fa9ab95bbf (patch) | |
| tree | 42405a77d1918f69266c50ea45e011074ec0ffaa /include | |
| parent | c58616580ea520aab8dacef787d855bea3e81c25 (diff) | |
| parent | e2c7d8877e5caa2356b5bc8207535e83b126f653 (diff) | |
| download | linux-e63c733d03070d4d3aaf3a29775b42fa9ab95bbf.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- fixes for pen pen proximity / touch events in wacom driver, from Ping
Cheng and Benjamin Tissoires
- two new device-specific quirks from Oliver Neukum and Forest
Wilkinson
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: wacom: check for wacom->shared before following the pointer
HID: tivo: enable all buttons on the TiVo Slide Pro remote
HID: add ALWAYS_POLL quirk for a Logitech 0xc007
HID: wacom: rely on actual touch down count to decide touch_down
HID: wacom: do not send pen events before touch is up/forced out
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions