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: fe50fc1 1b69b8a 82a2d62)

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	1e6e363a8450119523a7700d4ca266cb5c91d741
tree	ac0351e3242df1bcf69f9ecc66c3f9249318616a	tree \| snapshot
parent	fe50fc1baa2ec066394937d8241e457a72678695	commit \| diff
parent	1b69b8a551c9d618d137c9477c44c3b744143b63	commit \| diff
parent	82a2d62684e542ae93a2cd5adf68592f811965d0	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.