Skip to content
Commit 38e50c9b authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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: default avatarJiri Kosina <jkosina@suse.cz>
parents d29ed11b 39bbf402
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment