Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for...

author Jiri Kosina <jkosina@suse.cz>

Tue, 17 May 2016 10:38:03 +0000 (12:38 +0200)

committer Jiri Kosina <jkosina@suse.cz>

Tue, 17 May 2016 10:38:03 +0000 (12:38 +0200)
author Jiri Kosina <jkosina@suse.cz>
Tue, 17 May 2016 10:38:03 +0000 (12:38 +0200)
committer Jiri Kosina <jkosina@suse.cz>
Tue, 17 May 2016 10:38:03 +0000 (12:38 +0200)
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Tue, 17 May 2016 10:38:03 +0000 (12:38 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Tue, 17 May 2016 10:38:03 +0000 (12:38 +0200)
		1	2	3	4
drivers/hid/hid-core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history