Merge branch 'acrux' into for-linus

author Jiri Kosina <[email protected]>

Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +0200)

committer Jiri Kosina <[email protected]>

Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +0200)
author Jiri Kosina <[email protected]>
Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +0200)
committer Jiri Kosina <[email protected]>
Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +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 <[email protected]>
	Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +0200)
committer	Jiri Kosina <[email protected]>
	Wed, 4 Aug 2010 13:29:35 +0000 (15:29 +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