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	29d2e22766d23f8f3ae3459fd2ed6934a2b2e1d5
tree	d799c1037eb55e5f8bdecf72d5fdd45ab4f57569	tree \| snapshot
parent	ae9b3a3415ee5302be73d3dc558c7a452945e869	commit \| diff
parent	973469b38e7fd1b33f7947f8533cc3b2e3b0e0d2	commit \| diff
parent	366195f651b54cc7db4867cd86c17422db8f5d84	commit \| diff
parent	e4a173c8a9e5f1ddd0fdc3fad97cc05f83c507fa	commit \| diff
parent	cb217df7af349b0e1d5f1f4214f7d721abba260f	commit \| diff
parent	bb63995bb9ece23b7d02687ec6489322c02fa888	commit \| diff
parent	f572eb19155112828dcea26ff44436c7e8cbb389	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