From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Mar 2012 21:05:52 +0000 (+0000)
Subject: Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git... 
X-Git-Tag: v3.4-rc1~72^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38abdcd0d0689aaca94e740ac67a952c7918caef;p=pandora-kernel.git

Merge branch 'for-armsoc' of ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2

Conflicts:
	arch/arm/mach-tegra/common.c
	arch/arm/mach-ux500/devices-common.c

This resolves two conflicts and lets us merge the exynos5 branch
cleanly.

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

38abdcd0d0689aaca94e740ac67a952c7918caef
Reading git-diff-tree failed