Merge branch 'for-3.13/holtek' into for-next

author Jiri Kosina <jkosina@suse.cz>

Fri, 25 Oct 2013 09:27:02 +0000 (10:27 +0100)

committer Jiri Kosina <jkosina@suse.cz>

Fri, 25 Oct 2013 09:27:02 +0000 (10:27 +0100)
author Jiri Kosina <jkosina@suse.cz>
Fri, 25 Oct 2013 09:27:02 +0000 (10:27 +0100)
committer Jiri Kosina <jkosina@suse.cz>
Fri, 25 Oct 2013 09:27:02 +0000 (10:27 +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
diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Fri, 25 Oct 2013 09:27:02 +0000 (10:27 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Fri, 25 Oct 2013 09:27:02 +0000 (10:27 +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
drivers/hid/usbhid/hid-quirks.c	patch \|	diff1 \|	diff2 \|	blob \| history