projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d29ed11 39bbf40)
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)
commit38e50c9ba84ad755247220ce6a881fbdb44aaeec
tree6a06f6d811781ca81f4cfcf56d71882fd4b041c1tree | snapshot
parentd29ed11bb728bbe5175d1e9ff592140150305ab6commit | diff
parent39bbf40227bcd37e02f7983b2d06696c10cec43acommit | 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
John Crispins staging tree