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

Conflicts:
	arch/arm/mach-omap2/Makefile
	arch/arm/plat-omap/devices.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-msm/board-msm8x60.c
index cf38e2284fa956437ea3161f92c5fb1be09e147c,cf38e2284fa956437ea3161f92c5fb1be09e147c..f4824ad4d0bf0a598dddd0c26a1d00e7849dd1c4
--- 1/arch/arm/mach-msm/board-msm8x60.c
--- 2/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@@ -142,6 -142,6 +142,8 @@@ MACHINE_EN
  #ifdef CONFIG_OF
  /* TODO: General device tree support for all MSM. */
  DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
++      .fixup = msm8x60_fixup,
++      .reserve = msm8x60_reserve,
        .map_io = msm8x60_map_io,
        .init_irq = msm8x60_init_irq,
        .init_machine = msm8x60_dt_init,

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