Conflicts:
	drivers/hid/wacom_wac.c

Need to fetch the 4.0 fixes to apply 4.1 patches based on top
of those.
Signed-off-by: NJiri Kosina <jkosina@suse.cz>