Merge branch 'ux500/delete-u5500' into next/soc
Conflicts:
arch/arm/mach-ux500/cache-l2x0.c
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/mbox-db5500.c
arch/arm/mach-ux500/platsmp.c
arch/arm/mach-ux500/timer.c
Resolve lots of identical conflicts between the removal of
u5500 and the addition of u8540.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>
Showing
此差异已折叠。
drivers/mfd/ab5500-core.c
已删除
100644 → 0
此差异已折叠。
drivers/mfd/ab5500-debugfs.c
已删除
100644 → 0
此差异已折叠。
drivers/mfd/ab5500-debugfs.h
已删除
100644 → 0
drivers/mfd/db5500-prcmu.c
已删除
100644 → 0
此差异已折叠。
想要评论请 注册 或 登录