]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cbc5bc6 0219387)
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)
commit1e5f14e2ff6fb62f7f5eacb2e71369783d836d6e
tree6a06f6d811781ca81f4cfcf56d71882fd4b041c1tree | snapshot
parentcbc5bc6237ea7b3746006b0cbd7c2234838ece7acommit | diff
parent021938741187e2f266d65b3b4035aa74b1c76114commit | 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.