Merge branches 'imx/pata' and 'imx/sata' into next/driver