Merge branch 'upstream' into for-next

author Jiri Kosina <jkosina@suse.cz>

Mon, 17 Oct 2011 15:06:25 +0000 (17:06 +0200)

committer Jiri Kosina <jkosina@suse.cz>

Mon, 17 Oct 2011 15:06:25 +0000 (17:06 +0200)
author Jiri Kosina <jkosina@suse.cz>
Mon, 17 Oct 2011 15:06:25 +0000 (17:06 +0200)
committer Jiri Kosina <jkosina@suse.cz>
Mon, 17 Oct 2011 15:06:25 +0000 (17:06 +0200)
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/Makefile
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 Oct 2011 15:06:25 +0000 (17:06 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Mon, 17 Oct 2011 15:06:25 +0000 (17:06 +0200)
		1	2
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/Makefile	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