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: NArnd Bergmann <arnd@arndb.de>
Showing
arch/arm/mach-kirkwood/pm.h
0 → 100644
arch/arm/mach-mvebu/board-t5325.c
0 → 100644
arch/arm/mach-mvebu/board.h
0 → 100644
arch/arm/mach-mvebu/kirkwood-pm.c
0 → 100644
arch/arm/mach-mvebu/kirkwood-pm.h
0 → 100644
arch/arm/mach-mvebu/kirkwood.c
0 → 100644
arch/arm/mach-mvebu/kirkwood.h
0 → 100644
想要评论请 注册 或 登录