Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorTejun Heo <tj@kernel.org>
Wed, 30 Jul 2014 16:49:04 +0000 (12:49 -0400)
committerTejun Heo <tj@kernel.org>
Wed, 30 Jul 2014 16:49:04 +0000 (12:49 -0400)
commite8f781836dc3335b5533f6e177a105bbe3ee7345
treeb6f05b7bf6e69bcc436ab894b7dc84c28c746d1a
parent19f5be0f40922717e2b6e39a9822e7e7f30fd81f
parent1a112d10f03e83fb3a2fdc4c9165865dec8a3ca6
Merge branch 'for-3.16-fixes' of git://git./linux/kernel/git/tj/libata into for-3.17

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>
drivers/ata/ahci.h
drivers/ata/ahci_imx.c
drivers/ata/ahci_xgene.c
drivers/ata/libahci_platform.c