]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71aa1c6 ca47998)
Merge branch 'for-4.14/multitouch' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:11:52 +0000 (11:11 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:11:52 +0000 (11:11 +0200)
commit52662d345f0f30d0f9ff6ad1827291770a79090f
tree6a06f6d811781ca81f4cfcf56d71882fd4b041c1tree | snapshot
parent71aa1c608a6ddf6ee5260730f2d0c325e67b782ecommit | diff
parentca479985bcc4cef8696449be78beebf8d8b745fecommit | diff
Merge branch 'for-4.14/multitouch' into for-linus

- support for media keys on Asus T304UA from João Paulo Rechi Vita
- support for Microsoft Win8 Wireless Radio Controls extensions
  from João Paulo Rechi Vita

Conflicts:
drivers/hid/hid-ids.h

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-ids.h diff1 | diff2 | blob | history
drivers/hid/hid-multitouch.c diff1 | diff2 | blob | history
include/linux/hid.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.