Merge branch 'for-4.3/gembird' into for-next

author Jiri Kosina <jkosina@suse.cz>

Tue, 18 Aug 2015 13:04:47 +0000 (15:04 +0200)

committer Jiri Kosina <jkosina@suse.cz>

Tue, 18 Aug 2015 13:04:47 +0000 (15:04 +0200)
author Jiri Kosina <jkosina@suse.cz>
Tue, 18 Aug 2015 13:04:47 +0000 (15:04 +0200)
committer Jiri Kosina <jkosina@suse.cz>
Tue, 18 Aug 2015 13:04:47 +0000 (15:04 +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
author	Jiri Kosina <jkosina@suse.cz>
	Tue, 18 Aug 2015 13:04:47 +0000 (15:04 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Tue, 18 Aug 2015 13:04:47 +0000 (15:04 +0200)
		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