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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: eed7041 abc3f12)

author	Arnd Bergmann <arnd@arndb.de>
	Wed, 2 Nov 2011 01:48:10 +0000 (02:48 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Wed, 2 Nov 2011 01:48:10 +0000 (02:48 +0100)
commit	75e51a11f06998d148ed309b5b7c618c950ec73a
tree	ea63258da592b2157d8c838b1cbcfa235beb7ee8	tree \| snapshot
parent	eed7041a509503610fd0ccb5042a14de5759bd6b	commit \| diff
parent	abc3f126ac736280c68db6472eb0040ddf6e1b1f	commit \| diff

Merge branch 'next/soc' into for-linus

Conflicts:
arch/arm/Kconfig

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/Makefile.boot	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/Kconfig	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules