From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 14 May 2012 14:29:32 +0000 (+0200)
Subject: Merge branch 'ux500/delete-u5500' into next/soc
X-Git-Tag: v3.5-rc1~153^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=815acebff7ac578970986ca3f0ff406c92a0e243;p=pandora-kernel.git

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>
---

815acebff7ac578970986ca3f0ff406c92a0e243
Reading git-diff-tree failed