Merge branch 'for-4.18/hid-steam' into for-linus

author Jiri Kosina <jkosina@suse.cz>

Fri, 8 Jun 2018 08:22:26 +0000 (10:22 +0200)

committer Jiri Kosina <jkosina@suse.cz>

Fri, 8 Jun 2018 08:22:26 +0000 (10:22 +0200)
author Jiri Kosina <jkosina@suse.cz>
Fri, 8 Jun 2018 08:22:26 +0000 (10:22 +0200)
committer Jiri Kosina <jkosina@suse.cz>
Fri, 8 Jun 2018 08:22:26 +0000 (10:22 +0200)
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/Makefile
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Fri, 8 Jun 2018 08:22:26 +0000 (10:22 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Fri, 8 Jun 2018 08:22:26 +0000 (10:22 +0200)
		1	2
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history