Merge branch 'samsung/cleanup' into next/boards

Conflicts:
	arch/arm/mach-imx/mach-imx6q.c
	arch/arm/mach-omap2/board-ti8168evm.c
	arch/arm/mach-s3c64xx/Kconfig
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/board-dt-tegra20.c
	arch/arm/mach-tegra/common.c

Lots of relatively simple conflicts between the board
changes and stuff from the arm tree. This pulls in
the resolution from the samsung/cleanup tree, so we
don't get conflicting merges.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index b38cd7b240e8..e921e3be24a4 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -671,6 +671,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35")
         .handle_irq     = omap3_intc_handle_irq,
         .init_machine   = cm_t35_init,
         .timer          = &omap3_timer,
+        .restart        = omap_prcm_restart,
 MACHINE_END
 
 MACHINE_START(CM_T3730, "Compulab CM-T3730")
@@ -682,4 +683,5 @@ MACHINE_START(CM_T3730, "Compulab CM-T3730")
         .handle_irq     = omap3_intc_handle_irq,
         .init_machine   = cm_t3730_init,
         .timer          = &omap3_timer,
+        .restart        = omap_prcm_restart,
 MACHINE_END