From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 17 Mar 2014 10:50:05 +0000 (+0100)
Subject: Merge branch 'mvebu/soc3' into next/dt
X-Git-Tag: v3.15-rc1~77^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54cab10f63f20750cd2911e353cf8068f1ecf0a5;p=pandora-kernel.git

Merge branch 'mvebu/soc3' into next/dt

The dts Makefile has a bunch of nasty conflicts, attempt to resolve
these now to avoid trouble later.

Conflicts:
	arch/arm/boot/dts/Makefile

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

54cab10f63f20750cd2911e353cf8068f1ecf0a5
Reading git-diff-tree failed