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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

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

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

diff --cc arch/arm/mach-msm/board-msm8x60.c
index 106170fb1844b5d580577189f3cfe16f53e322ab,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
@@@ -105,3 -138,14 +138,16 @@@ MACHINE_START(MSM8X60_FFA, "QCT MSM8X6
        .init_machine = msm8x60_init,
        .timer = &msm_timer,
  MACHINE_END
+ 
+ #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,
+       .timer = &msm_timer,
+       .dt_compat = msm8x60_fluid_match,
+ MACHINE_END
+ #endif /* CONFIG_OF */

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/i2c.c
index 2388b8eebaaada9bfabbcc3369e90bcef9285b40,c20beb8ed38b7230dfd3183b21db34b7e8eda190..679cbd49c01945633b81b7c68cf25b0c38dfdc56
--- 1/arch/arm/plat-omap/i2c.c
--- 2/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@@ -151,10 -127,9 +143,10 @@@ static inline int omap2_i2c_add_bus(in
  {
        int l;
        struct omap_hwmod *oh;
-       struct omap_device *od;
+       struct platform_device *pdev;
        char oh_name[MAX_OMAP_I2C_HWMOD_NAME_LEN];
        struct omap_i2c_bus_platform_data *pdata;
 +      struct omap_i2c_dev_attr *dev_attr;
  
        omap2_i2c_mux_pins(bus_id);
  

diff --cc drivers/misc/Kconfig
Simple merge