]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit54cab10f63f20750cd2911e353cf8068f1ecf0a5
tree33469b47a3cabd27b09bc9f52359f2ac3c2fa453tree | snapshot
parente887ae25b03c3608229de4fac6024c14f369a75ecommit | diff
parent00e8ec2f0b05bfc8acaf13cf91c2ca1e624f3535commit | diff
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>
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/boot/dts/Makefile diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules