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>
	Sat, 8 Oct 2011 20:11:00 +0000 (22:11 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Sat, 8 Oct 2011 20:11:00 +0000 (22:11 +0200)
commit	501985c17b0cd44d4a710f5dd6bbd002c9a333e6
tree	d025051d0c2f0fcf1086a2dbd8cb9f10f587dd5e	tree \| snapshot
parent	900d3446d02eed53877cfc6004291c3b64714506	commit \| diff
parent	5efeaff08a5274727fa57c03c3d864cf1980194b	commit \| diff

Merge branch 'next/cross-platform' into for-next

Conflicts:
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-u300/Makefile.boot

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/compressed/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/common/gic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/hardware/cache-l2x0.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/saar.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/cache-l2x0.c	diff1 \|	diff2 \|	blob \| history