| commit | 54cab10f63f20750cd2911e353cf8068f1ecf0a5 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Mar 17 11:50:05 2014 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Mar 17 12:13:09 2014 +0100 |
| tree | 33469b47a3cabd27b09bc9f52359f2ac3c2fa453 | |
| parent | e887ae25b03c3608229de4fac6024c14f369a75e [diff] | |
| parent | 00e8ec2f0b05bfc8acaf13cf91c2ca1e624f3535 [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>