tree 651c411bbedeb0500ab9912766e992be3d5a8bab
parent 417f381c4568212275f0244500d7d5e1cdb5f99f
parent 72fb92200d6c31b9982c06784e4bcff2f5b7d8b6
author Arnd Bergmann <arnd@arndb.de> 1337005772 +0200
committer Arnd Bergmann <arnd@arndb.de> 1337005772 +0200

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>