Merge branch 'samsung_platform_data' into staging/for_v3.7

* samsung_platform_data:
  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

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

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

diff --cc arch/arm/mach-davinci/board-da850-evm.c
index bc6b8c7b86c33e8ed8587c63d3f3fc1dbb37a1ed,1295e616ceee7e32a5b31d62b3cf52a4286578b3..32ee3f89596738d988a00105c0358d4ff1a61f1b
--- 1/arch/arm/mach-davinci/board-da850-evm.c
--- 2/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@@ -40,14 -40,11 +40,14 @@@
  
  #include <mach/cp_intc.h>
  #include <mach/da8xx.h>
- #include <mach/nand.h>
+ #include <linux/platform_data/mtd-davinci.h>
  #include <mach/mux.h>
- #include <mach/aemif.h>
- #include <mach/spi.h>
+ #include <linux/platform_data/mtd-davinci-aemif.h>
+ #include <linux/platform_data/spi-davinci.h>
  
 +#include <media/tvp514x.h>
 +#include <media/adv7343.h>
 +
  #define DA850_EVM_PHY_ID              "davinci_mdio-0:00"
  #define DA850_LCD_PWR_PIN             GPIO_TO_PIN(2, 8)
  #define DA850_LCD_BL_PIN              GPIO_TO_PIN(2, 15)

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

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

diff --cc arch/arm/mach-davinci/include/mach/da8xx.h
index 8eecbce7febc08a64e0b89d6fc15fe8af616652e,33e78ae2a254d3106f97a42dcf68aa2cebc076c2..13d229575757ffadcce3636068c03512d04fa948
--- 1/arch/arm/mach-davinci/include/mach/da8xx.h
--- 2/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@@ -20,15 -19,13 +20,15 @@@
  
  #include <mach/serial.h>
  #include <mach/edma.h>
- #include <mach/i2c.h>
  #include <mach/asp.h>
- #include <mach/mmc.h>
- #include <mach/usb.h>
  #include <mach/pm.h>
- #include <mach/spi.h>
+ #include <linux/platform_data/i2c-davinci.h>
+ #include <linux/platform_data/mmc-davinci.h>
+ #include <linux/platform_data/usb-davinci.h>
+ #include <linux/platform_data/spi-davinci.h>
  
 +#include <media/davinci/vpif_types.h>
 +
  extern void __iomem *da8xx_syscfg0_base;
  extern void __iomem *da8xx_syscfg1_base;
  

diff --cc arch/arm/mach-dove/common.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-nuri.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-origen.c
index a54ce4ef7057c765db83f0217fa65ccff09ec884,4a531dccd0c6f175efbbbd09c97d6849d30fc2de..0b8d24e27e74d45eeff900341b62808673dd066e
--- 1/arch/arm/mach-exynos/mach-origen.c
--- 2/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@@ -42,9 -42,8 +42,9 @@@
  #include <plat/backlight.h>
  #include <plat/fb.h>
  #include <plat/mfc.h>
 +#include <plat/hdmi.h>
  
- #include <mach/ohci.h>
+ #include <linux/platform_data/usb-exynos.h>
  #include <mach/map.h>
  
  #include <drm/exynos_drm.h>

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
index 73f2bce097e179822d9a08d4dc14bba6f104888c,fa2ada6c9ca7d09bef0b4256c5f14ce1985748d0..1b864ee387cd70a73e65f93fb74058891c0ed273
--- 1/arch/arm/mach-exynos/mach-smdkv310.c
--- 2/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@@ -38,12 -38,11 +38,12 @@@
  #include <plat/gpio-cfg.h>
  #include <plat/backlight.h>
  #include <plat/mfc.h>
- #include <plat/ehci.h>
+ #include <linux/platform_data/usb-ehci-s5p.h>
  #include <plat/clock.h>
 +#include <plat/hdmi.h>
  
  #include <mach/map.h>
- #include <mach/ohci.h>
+ #include <linux/platform_data/usb-exynos.h>
  
  #include <drm/exynos_drm.h>
  #include "common.h"

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge

diff --cc arch/arm/mach-kirkwood/common.c
Simple merge

diff --cc arch/arm/mach-kirkwood/db88f6281-bp-setup.c
Simple merge

diff --cc arch/arm/mach-mmp/sram.c
Simple merge

diff --cc arch/arm/mach-mv78xx0/common.c
Simple merge

diff --cc arch/arm/mach-orion5x/common.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/devices-common.h
Simple merge

diff --cc arch/arm/plat-orion/common.c
Simple merge

diff --cc arch/arm/plat-samsung/devs.c
Simple merge

diff --cc drivers/media/platform/davinci/vpbe_venc.c
Simple merge

diff --cc drivers/media/platform/s5p-fimc/mipi-csis.c
Simple merge

diff --cc drivers/media/platform/soc_camera/mx1_camera.c
Simple merge

diff --cc drivers/media/platform/soc_camera/mx2_camera.c
Simple merge

diff --cc drivers/media/platform/soc_camera/mx3_camera.c
Simple merge

diff --cc drivers/media/platform/soc_camera/pxa_camera.c
Simple merge

diff --cc drivers/tty/serial/imx.c
Simple merge