Merge branch 'for-4.15/wacom' into for-linus

author Jiri Kosina <[email protected]>

Wed, 15 Nov 2017 10:14:23 +0000 (11:14 +0100)

committer Jiri Kosina <[email protected]>

Wed, 15 Nov 2017 10:14:23 +0000 (11:14 +0100)
author Jiri Kosina <[email protected]>
Wed, 15 Nov 2017 10:14:23 +0000 (11:14 +0100)
committer Jiri Kosina <[email protected]>
Wed, 15 Nov 2017 10:14:23 +0000 (11:14 +0100)
diff --cc drivers/hid/wacom_sys.c
Simple merge
diff --cc drivers/hid/wacom_wac.h
Simple merge
author	Jiri Kosina <[email protected]>
	Wed, 15 Nov 2017 10:14:23 +0000 (11:14 +0100)
committer	Jiri Kosina <[email protected]>
	Wed, 15 Nov 2017 10:14:23 +0000 (11:14 +0100)
		1	2
drivers/hid/wacom_sys.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/wacom_wac.h	patch \|	diff1 \|	diff2 \|	blob \| history