Merge branch 'next/soc' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/id.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 3c7675a6a8f4edaa1103881335a208da6de476cb,0c9a183131e2a79733c7eb74fde02de1d6ecda2c..28bbd56346a93ab67fc377eb1ea066a8be8280f7
--- 1/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@@ -249,9 -329,14 +249,9 @@@ static struct omap_hwmod_class am33xx_g
  };
  
  static struct omap_hwmod_rst_info am33xx_gfx_resets[] = {
-       { .name = "gfx", .rst_shift = 0 },
+       { .name = "gfx", .rst_shift = 0, .st_shift = 0},
  };
  
 -static struct omap_hwmod_irq_info am33xx_gfx_irqs[] = {
 -      { .name = "gfxint", .irq = 37 + OMAP_INTC_START, },
 -      { .irq = -1 },
 -};
 -
  static struct omap_hwmod am33xx_gfx_hwmod = {
        .name           = "gfx",
        .class          = &am33xx_gfx_hwmod_class,

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

diff --cc arch/arm/mach-vexpress/v2m.c
index d6016970e2fe1aad9694c699a08572acb5b17151,b0eccf7e06ecb0331a32973acc5664d8fedaa933..95a469e23e378078af77ffcd9eecc9b29e5ff264
--- 1/arch/arm/mach-vexpress/v2m.c
--- 2/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@@ -455,8 -456,10 +455,9 @@@ static const char * const v2m_dt_match[
  DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
        .dt_compat      = v2m_dt_match,
        .smp            = smp_ops(vexpress_smp_ops),
+       .smp_init       = smp_init_ops(vexpress_smp_init_ops),
        .map_io         = v2m_dt_map_io,
        .init_early     = v2m_dt_init_early,
 -      .init_irq       = irqchip_init,
        .init_time      = v2m_dt_timer_init,
        .init_machine   = v2m_dt_init,
  MACHINE_END

diff --cc drivers/clk/Makefile
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge