• Olof Johansson's avatar
    Merge branch 'multiplatform/platform-data' into next/multiplatform · e3a66aa3
    Olof Johansson authored
    * multiplatform/platform-data:
      ARM: spear: move platform_data definitions
      ARM: samsung: move platform_data definitions
      ARM: orion: move platform_data definitions
      ARM: nomadik: move platform_data definitions
      ARM: w90x900: move platform_data definitions
      ARM: vt8500: move platform_data definitions
      ARM: tegra: move sdhci platform_data definition
      ARM: sa1100: move platform_data definitions
      ARM: pxa: move platform_data definitions
      ARM: netx: move platform_data definitions
      ARM: msm: move platform_data definitions
      ARM: imx: move platform_data definitions
      ARM: ep93xx: move platform_data definitions
      ARM: davinci: move platform_data definitions
      ARM: at91: move platform_data definitions
    
    Conflicts due to removed files:
    	arch/arm/mach-tegra/board-harmony.c
    	arch/arm/mach-tegra/board-trimslice.c
    
    Conflicts due to code removal:
    	arch/arm/mach-tegra/board-paz00.c
    
    Context conflicts in:
    	drivers/mmc/host/sdhci-tegra.c
    	drivers/net/irda/pxaficp_ir.c
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    e3a66aa3
board-paz00.c 1.15 KB