drivers/hid/hid-ids.h · b42a362e6d10c342004b183defcb9940331b6737 · Kirill Smelkov / linux

Merge branch 'for-4.14/multitouch' into for-linus · 38e50c9b

Jiri Kosina authored Sep 05, 2017

- 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>

38e50c9b

hid-ids.h 41.8 KB

Replace hid-ids.h