Commit 54cab10f authored 11 years ago by Arnd Bergmann

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>

parents e887ae25 00e8ec2f

Hide whitespace changes

Inline Side-by-side

Showing with 250 additions and 117 deletions

Please register or to comment