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-Tag: firefly_0821_release~3680^2~1484^2~14^2~18
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a93d620159524088d9633f60a8f746e3dd2e791e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'clps711x/soc' into clps711x/soc2

Conflicts:
	arch/arm/Kconfig

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

a93d620159524088d9633f60a8f746e3dd2e791e