Merge branch 'for-4.18/multitouch' into for-linus

author Jiri Kosina <[email protected]>

Fri, 8 Jun 2018 08:25:50 +0000 (10:25 +0200)

committer Jiri Kosina <[email protected]>

Fri, 8 Jun 2018 08:25:50 +0000 (10:25 +0200)
author Jiri Kosina <[email protected]>
Fri, 8 Jun 2018 08:25:50 +0000 (10:25 +0200)
committer Jiri Kosina <[email protected]>
Fri, 8 Jun 2018 08:25:50 +0000 (10:25 +0200)
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-input.c
Simple merge
diff --cc include/linux/hid.h
Simple merge
author	Jiri Kosina <[email protected]>
	Fri, 8 Jun 2018 08:25:50 +0000 (10:25 +0200)
committer	Jiri Kosina <[email protected]>
	Fri, 8 Jun 2018 08:25:50 +0000 (10:25 +0200)
		1	2
drivers/hid/hid-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-input.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/hid.h	patch \|	diff1 \|	diff2 \|	blob \| history