git.baikalelectronics.ru Git - kernel.git/commit

author	Jiri Kosina <jkosina@suse.cz>
	Wed, 12 Dec 2012 20:41:55 +0000 (21:41 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Wed, 12 Dec 2012 20:41:55 +0000 (21:41 +0100)
commit	6b3a976a8f12b7999bfccc7487b4378220187612
tree	d799c1037eb55e5f8bdecf72d5fdd45ab4f57569	tree \| snapshot
parent	af378b26dc1a56c56a5cab35b3aa9b8a8264b412	commit \| diff
parent	00b0d4a47e45036122fac1d180bd47a78c3a01ef	commit \| diff
parent	2e9be44ae8229e4dc98e60c66a8a892c707fd84e	commit \| diff
parent	6bc0568b26125c868df16db5d2dbcc178915f1cb	commit \| diff
parent	1d2b449170c5a4fca844c5261804ceb10c398959	commit \| diff
parent	33bd533d00694f0158411021e8674825778e0756	commit \| diff
parent	5ce1435d495cecf18305dae67c3850a84c3ab4f0	commit \| diff

Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus

Conflicts:
drivers/hid/hid-core.c

drivers/hid/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/hid/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/hid/hid-apple.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/hid/hid-input.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/hid/hid-sensor-hub.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/hid/usbhid/hid-quirks.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
include/linux/hid.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history