Merge branches 'for-4.2/upstream-fixes-devm-fixed' and 'for-4.3/upstream' into for...

author Jiri Kosina <jkosina@suse.cz>

Tue, 1 Sep 2015 13:23:13 +0000 (15:23 +0200)

committer Jiri Kosina <jkosina@suse.cz>

Tue, 1 Sep 2015 13:23:13 +0000 (15:23 +0200)
author Jiri Kosina <jkosina@suse.cz>
Tue, 1 Sep 2015 13:23:13 +0000 (15:23 +0200)
committer Jiri Kosina <jkosina@suse.cz>
Tue, 1 Sep 2015 13:23:13 +0000 (15:23 +0200)
diff --cc drivers/hid/hid-input.c
Simple merge
diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge
diff --cc drivers/hid/wacom_sys.c
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Tue, 1 Sep 2015 13:23:13 +0000 (15:23 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Tue, 1 Sep 2015 13:23:13 +0000 (15:23 +0200)
		1	2
drivers/hid/hid-input.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/usbhid/hid-quirks.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/wacom_sys.c	patch \|	diff1 \|	diff2 \|	blob \| history