git.kernelconcepts.de Git - karo-tx-linux.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	818b930bc15077fc00ff16bb22c5df1857f05afa
tree	d799c1037eb55e5f8bdecf72d5fdd45ab4f57569	tree \| snapshot
parent	f9af7b9edccb87d4d80b58687ab63e58f3b64c4c	commit \| diff
parent	b5531318f18b5054c0e4a82beb560a77d85948d8	commit \| diff
parent	7a7d6d9c5fcd4b674da38e814cfc0724c67731b2	commit \| diff
parent	1b42fc4a2889729c740321eb487f887161e38428	commit \| diff
parent	955dca354c3c02850409e773fcbd625ac68dd5e7	commit \| diff
parent	68fd32b8228a62ca7f46ed64da8267daad29480b	commit \| diff
parent	4529eefad087f97b33c0f31984d924b1f15d7bae	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