Commits
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
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