Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus

author Jiri Kosina <jkosina@suse.cz>

Tue, 20 Mar 2012 12:04:25 +0000 (13:04 +0100)

committer Jiri Kosina <jkosina@suse.cz>

Tue, 20 Mar 2012 12:04:25 +0000 (13:04 +0100)
author Jiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:04:25 +0000 (13:04 +0100)
committer Jiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:04:25 +0000 (13:04 +0100)
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc drivers/hid/hid-input.c
Simple merge
diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Tue, 20 Mar 2012 12:04:25 +0000 (13:04 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Tue, 20 Mar 2012 12:04:25 +0000 (13:04 +0100)
		1	2	3	4
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/hid/hid-input.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/hid/usbhid/hid-quirks.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history