Merge remote-tracking branch 'arm/for-next'

Conflicts:
	arch/arm/mach-mxs/mach-m28evk.c
	arch/arm/mach-mxs/mach-stmp378x_devb.c
	arch/arm/mach-shmobile/board-kota2.c

diff --cc arch/arm/mach-at91/at91sam9260.c
Simple merge

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm365-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm646x-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/dm646x.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_babbage.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx53_evk.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx53_loco.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx53_smd.c
Simple merge

diff --cc arch/arm/mach-mx5/imx51-dt.c
Simple merge

diff --cc arch/arm/mach-mx5/imx53-dt.c
Simple merge

diff --cc arch/arm/mach-mxs/mach-m28evk.c
index 6b00577b70256254e29951bdf8828a2ecd613fdb,7799cd91a341b9301946d8f98ebc9c943b3e6596..2f2758230edf83f4cd98ae5a80817dd2b6c4e0ad
--- 1/arch/arm/mach-mxs/mach-m28evk.c
--- 2/arch/arm/mach-mxs/mach-m28evk.c
+++ b/arch/arm/mach-mxs/mach-m28evk.c
@@@ -361,6 -361,7 +361,7 @@@ static struct sys_timer m28evk_timer = 
  MACHINE_START(M28EVK, "DENX M28 EVK")
        .map_io         = mx28_map_io,
        .init_irq       = mx28_init_irq,
 -      .init_machine   = m28evk_init,
        .timer          = &m28evk_timer,
 +      .init_machine   = m28evk_init,
+       .restart        = mxs_restart,
  MACHINE_END

diff --cc arch/arm/mach-mxs/mach-stmp378x_devb.c
index 6834dea38c04cce77e20bffc2baa3019327d9610,857e857672c4b1484483f7822e9726a8da56635f..a626c07b8713c46235eac72e3a1ef3dda9abdd0e
--- 1/arch/arm/mach-mxs/mach-stmp378x_devb.c
--- 2/arch/arm/mach-mxs/mach-stmp378x_devb.c
+++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c
@@@ -115,6 -115,7 +115,7 @@@ static struct sys_timer stmp378x_dvb_ti
  MACHINE_START(STMP378X, "STMP378X")
        .map_io         = mx23_map_io,
        .init_irq       = mx23_init_irq,
 -      .init_machine   = stmp378x_dvb_init,
        .timer          = &stmp378x_dvb_timer,
 +      .init_machine   = stmp378x_dvb_init,
+       .restart        = mxs_restart,
  MACHINE_END

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
Simple merge

diff --cc arch/arm/mach-prima2/prima2.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-smdkv210.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-ag5evm.c
index 7119b87cbfa0caa2727334b7815a8cf388ff6077,202c3c6ec9d8667759a22bd6079835be18220a3f..f71fa3c13c8c1a4e3c77f6802014fca113b3a5a4
--- 1/arch/arm/mach-shmobile/board-ag5evm.c
--- 2/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@@ -607,9 -607,8 +607,9 @@@ struct sys_timer ag5evm_timer = 
  
  MACHINE_START(AG5EVM, "ag5evm")
        .map_io         = ag5evm_map_io,
 +      .nr_irqs        = NR_IRQS_LEGACY,
        .init_irq       = sh73a0_init_irq,
-       .handle_irq     = shmobile_handle_irq_gic,
+       .handle_irq     = gic_handle_irq,
        .init_machine   = ag5evm_init,
        .timer          = &ag5evm_timer,
  MACHINE_END

diff --cc arch/arm/mach-shmobile/board-kota2.c
index f44150b5ae46fc3a9f9c7ef57d04a30b2031dde3,1b4439d3f9d51e41b9c3c0824eb5990389cd1343..857ceeec1bb0e9975eb589deb82fbde7a9be856a
--- 1/arch/arm/mach-shmobile/board-kota2.c
--- 2/arch/arm/mach-shmobile/board-kota2.c
+++ b/arch/arm/mach-shmobile/board-kota2.c
@@@ -549,9 -447,8 +549,9 @@@ struct sys_timer kota2_timer = 
  
  MACHINE_START(KOTA2, "kota2")
        .map_io         = kota2_map_io,
 -      .init_irq       = kota2_init_irq,
 +      .nr_irqs        = NR_IRQS_LEGACY,
 +      .init_irq       = sh73a0_init_irq,
-       .handle_irq     = shmobile_handle_irq_gic,
+       .handle_irq     = gic_handle_irq,
        .init_machine   = kota2_init,
        .timer          = &kota2_timer,
  MACHINE_END

diff --cc mm/vmalloc.c
Simple merge