git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ccfa24b 7392d73)

author	Jiri Kosina <jkosina@suse.cz>
	Tue, 3 Jul 2012 09:18:50 +0000 (11:18 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Tue, 3 Jul 2012 09:18:50 +0000 (11:18 +0200)
commit	f2164d748cc4a947b2f9aa8fdfd72a12facf0b20
tree	328852b00498d89c800c397057ba097f25ce7f48	tree \| snapshot
parent	ccfa24bf61de206d17787a8bb318fb1536281b8d	commit \| diff
parent	7392d73be2b3c907d65126f072c313215e1907b3	commit \| diff

Merge branch 'roccat' into for-next

Conflicts:
drivers/hid/Kconfig

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/hid/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hid/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules