From: Olof Johansson <olof@lixom.net>
Date: Wed, 21 Nov 2012 06:21:32 +0000 (-0800)
Subject: Merge branch 'clps711x/soc' into clps711x/soc2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a93d620159524088d9633f60a8f746e3dd2e791e;p=linux-beck.git

Merge branch 'clps711x/soc' into clps711x/soc2

Conflicts:
	arch/arm/Kconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
---

a93d620159524088d9633f60a8f746e3dd2e791e