libata: Merge branch 'for-3.13-fixes' into for-3.14

Pulling in for-3.13-fixes for the ahci_imx fix as further changes
depend on it.

Signed-off-by: Tejun Heo <tj@kernel.org>