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

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

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 14 May 2012 14:29:32 +0000 (16:29 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 14 May 2012 14:29:32 +0000 (16:29 +0200)
commit	815acebff7ac578970986ca3f0ff406c92a0e243
tree	651c411bbedeb0500ab9912766e992be3d5a8bab	tree \| snapshot
parent	417f381c4568212275f0244500d7d5e1cdb5f99f	commit \| diff
parent	72fb92200d6c31b9982c06784e4bcff2f5b7d8b6	commit \| diff

Merge branch 'ux500/delete-u5500' into next/soc

Conflicts:
arch/arm/mach-ux500/cache-l2x0.c
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/mbox-db5500.c
arch/arm/mach-ux500/platsmp.c
arch/arm/mach-ux500/timer.c

Resolve lots of identical conflicts between the removal of
u5500 and the addition of u8540.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/mach-ux500/cache-l2x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/include/mach/hardware.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/include/mach/irqs.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/timer.c	diff1 \|	diff2 \|	blob \| history