git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e887ae2 00e8ec2)
Merge branch 'mvebu/soc3' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 10:50:05 +0000 (11:50 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 11:13:09 +0000 (12:13 +0100)
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>

Trivial merge
Pandora Kernel Repository