Merge branch 'next/driver' into for-next

Conflicts:
	arch/arm/mach-mx5/Kconfig

diff --cc arch/arm/mach-mx5/Kconfig
index b4f5ab669e486685d8d210f4f30a36f4082287d7,28b94e0e04b316094b388cbfa5fde78fca244735..5e42c73881a540ecf74f9e22eb8e2fefb2f4fd10
--- 1/arch/arm/mach-mx5/Kconfig
--- 2/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@@ -152,7 -147,7 +152,8 @@@ config MX51_EFIKA_COMMO
        bool
        select SOC_IMX51
        select IMX_HAVE_PLATFORM_IMX_UART
 +      select IMX_HAVE_PLATFORM_MXC_EHCI
+       select IMX_HAVE_PLATFORM_PATA_IMX
        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
        select IMX_HAVE_PLATFORM_SPI_IMX
        select MXC_ULPI if USB_ULPI

diff --cc arch/arm/mach-mx5/clock-mx51-mx53.c
Simple merge

diff --cc arch/arm/mach-mx5/devices-imx51.h
Simple merge

diff --cc arch/arm/mach-mx5/mx51_efika.c
Simple merge

diff --cc arch/arm/plat-mxc/devices/Kconfig
Simple merge