Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

The scheduled ahci platform patches depend on change in
for-3.16-fixes.  Pull it into for-3.17.

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

diff --cc drivers/ata/ahci.h
Simple merge

diff --cc drivers/ata/ahci_imx.c
Simple merge

diff --cc drivers/ata/ahci_xgene.c
Simple merge

diff --cc drivers/ata/libahci_platform.c
Simple merge