diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-03 11:06:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-03 11:06:01 -0700 |
commit | 1248ded656d8afb64be01b2985b7b3e562eac914 (patch) | |
tree | 030240b9f03080ff1ae6a97a88d03f98e0a7e078 /MAINTAINERS | |
parent | 1f6211a4ea0c38c4e162c7e8518e09ce43538905 (diff) | |
parent | eff6ca97998386447b795362cc20213114af2870 (diff) | |
download | linux-1248ded656d8afb64be01b2985b7b3e562eac914.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 the HID subsystem:
- regression fix for Wacom driver; commit introduced in 4.6-rc1
mistakenly removed line that should be kept. Fix by Ping Cheng
- two device-specific quirks, by Ping Cheng and Nazar Mokrynskyi"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: wacom: add missed stylus_in_proximity line back
HID: Fix boot delay for Creative SB Omni Surround 5.1 with quirk
HID: wacom: Add support for DTK-1651
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions