Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes' and...

author Jiri Kosina <jkosina@suse.cz>

Tue, 24 Jul 2012 11:39:00 +0000 (13:39 +0200)

committer Jiri Kosina <jkosina@suse.cz>

Tue, 24 Jul 2012 11:39:00 +0000 (13:39 +0200)
author Jiri Kosina <jkosina@suse.cz>
Tue, 24 Jul 2012 11:39:00 +0000 (13:39 +0200)
committer Jiri Kosina <jkosina@suse.cz>
Tue, 24 Jul 2012 11:39:00 +0000 (13:39 +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
diff --cc drivers/hid/hid-input.c
Simple merge
diff --cc drivers/hid/hid-picolcd.c
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Tue, 24 Jul 2012 11:39:00 +0000 (13:39 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Tue, 24 Jul 2012 11:39:00 +0000 (13:39 +0200)
		1	2	3	4	5	6
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/hid/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/hid/hid-core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/hid/hid-input.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/hid/hid-picolcd.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history