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)
commit5099bc83ba11ff38a530ebebed678f23877a2b2d
treecbc7d1c44a7c6b975121d8f2b57b6e806d05f013
parent276e722761a1c7903fbfb065420fd1850b00f1dd
parent830e82aa48f32518dfa5335c0134f611d4bab4b2
Merge branch 'for-4.20/microsoft' into for-linus

Rumble support for Xbox One S
drivers/hid/Kconfig
drivers/hid/hid-ids.h