Merge branches 'for-3.17/upstream', 'for-3.17/cp2112', 'for-3.17/huion', 'for-3.17...

author Jiri Kosina <jkosina@suse.cz>

Wed, 6 Aug 2014 09:09:53 +0000 (11:09 +0200)

committer Jiri Kosina <jkosina@suse.cz>

Wed, 6 Aug 2014 09:09:53 +0000 (11:09 +0200)
author Jiri Kosina <jkosina@suse.cz>
Wed, 6 Aug 2014 09:09:53 +0000 (11:09 +0200)
committer Jiri Kosina <jkosina@suse.cz>
Wed, 6 Aug 2014 09:09:53 +0000 (11:09 +0200)
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Wed, 6 Aug 2014 09:09:53 +0000 (11:09 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Wed, 6 Aug 2014 09:09:53 +0000 (11:09 +0200)
		1	2	3	4	5	6	7	8
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/hid/hid-core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/hid/usbhid/hid-quirks.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history