Jiri Kosina 38e50c9ba8 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>

2017-09-05 11:11:52 +02:00

50 KiB

Raw Blame History

View Raw