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

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

author	Arnd Bergmann <arnd@arndb.de>
	Fri, 26 Aug 2011 15:53:17 +0000 (15:53 +0000)
committer	Arnd Bergmann <arnd@arndb.de>
	Fri, 26 Aug 2011 15:53:17 +0000 (15:53 +0000)
commit	91dc67d94810fad9301bbe089ec8232c8d4adf91
tree	6eb60e22aee062204b22c81200ba81aa2774d574	tree \| snapshot
parent	aad28c9d301f71e1d0d7b1555607858771dce774	commit \| diff
parent	e93aabb5522be0a42b95be4ca91ef8f530c26975	commit \| diff

Merge branch 'next/devel' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into for-next

Conflicts:
arch/arm/mach-imx/Makefile
arch/arm/mach-mx5/Kconfig

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/mach-imx/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/clock-mx51-mx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/devices-imx51.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/mx51_efika.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx23evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx28evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-stmp378x_devb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/devices/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/common.h	diff1 \|	diff2 \|	blob \| history