diff options
| author | Linus Torvalds <[email protected]> | 2016-05-03 18:06:01 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-05-03 18:06:01 +0000 |
| commit | 1248ded656d8afb64be01b2985b7b3e562eac914 (patch) | |
| tree | 030240b9f03080ff1ae6a97a88d03f98e0a7e078 /net/tipc/node.c | |
| parent | Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | HID: wacom: add missed stylus_in_proximity line back (diff) | |
| download | kernel-1248ded656d8afb64be01b2985b7b3e562eac914.tar.gz kernel-1248ded656d8afb64be01b2985b7b3e562eac914.zip | |
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 'net/tipc/node.c')
0 files changed, 0 insertions, 0 deletions