Merge branch 'for-4.20/microsoft' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 23 Oct 2018 11:36:05 +0000 (13:36 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 23 Oct 2018 11:36:05 +0000 (13:36 +0200)
Rumble support for Xbox One S

1  2 
drivers/hid/Kconfig
drivers/hid/hid-ids.h

Simple merge
Simple merge