diff options
author | Jiri Kosina <jkosina@suse.cz> | 2016-05-17 12:38:03 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2016-05-17 12:38:03 +0200 |
commit | 27fd38c5226ed0f1712d071880fa8e739eb78650 (patch) | |
tree | 1e3b5714cb7828efc2b97375de1edc6006ee1af6 /drivers/hid | |
parent | HID: wacom: add missed stylus_in_proximity line back (diff) | |
parent | HID: asus: add support for VivoBook E200HA (diff) | |
parent | HID: hidraw: switch to using memdup_user (diff) | |
parent | HID: thingm: remove not needed error message (diff) | |
download | linux-27fd38c5226ed0f1712d071880fa8e739eb78650.tar.xz linux-27fd38c5226ed0f1712d071880fa8e739eb78650.zip |
Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for-4.7/thingm' into for-linus