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

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

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e99b5d5 e3063a6 2f0ccf7)

author	Jiri Kosina <jkosina@suse.cz>
	Tue, 30 Apr 2013 08:19:07 +0000 (10:19 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Tue, 30 Apr 2013 08:19:07 +0000 (10:19 +0200)
commit	641dd25d4d9b7b4f7a79862aa876cec5db8cd536
tree	ac0351e3242df1bcf69f9ecc66c3f9249318616a	tree \| snapshot
parent	e99b5d5a61a99c8aca5ba96eac7e4bf65a9d284e	commit \| diff
parent	e3063a6f5598cc6b1527ec2436b29e78dfd04169	commit \| diff
parent	2f0ccf77a4c4339d0342bd9ed4a115fb0121703a	commit \| diff

Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into for-linus

Conflicts:
drivers/hid/Kconfig

drivers/hid/Kconfig	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/hid/Makefile	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/hid/hid-lenovo-tpkbd.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/hid/hid-picolcd.h	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/hid/hid-steelseries.c	diff1 \|	diff2 \|	diff3 \|	blob \| history

Linux Kernel Source Tree.