Merge branch 'for-3.15/hid-cp2112' into for-next

author Jiri Kosina <jkosina@suse.cz>

Mon, 17 Feb 2014 22:33:53 +0000 (23:33 +0100)

committer Jiri Kosina <jkosina@suse.cz>

Mon, 17 Feb 2014 22:33:53 +0000 (23:33 +0100)
author Jiri Kosina <jkosina@suse.cz>
Mon, 17 Feb 2014 22:33:53 +0000 (23:33 +0100)
committer Jiri Kosina <jkosina@suse.cz>
Mon, 17 Feb 2014 22:33:53 +0000 (23:33 +0100)
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
author	Jiri Kosina <jkosina@suse.cz>
	Mon, 17 Feb 2014 22:33:53 +0000 (23:33 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Mon, 17 Feb 2014 22:33:53 +0000 (23:33 +0100)
		1	2
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history