Merge branches 'imx/pata' and 'imx/sata' into next/driver
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 13:17:34 +0000 (15:17 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 13:17:34 +0000 (15:17 +0200)
commita32750c2ca6f697903b19063fc86f4272865e3a1
tree57a23806c5358855eb426c006c88943afa683b1b
parent318007e9001349db9b4fcd49e9e79a7636dba7a9
parentd870ea1d6bc5057f2599416655b42ab192dae6d0
Merge branches 'imx/pata' and 'imx/sata' into next/driver

Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/mx51_efika.c
arch/arm/plat-mxc/devices/Kconfig
arch/arm/plat-mxc/devices/Makefile
arch/arm/plat-mxc/include/mach/devices-common.h