Merge branch 'for-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorTejun Heo <tj@kernel.org>
Mon, 9 Feb 2015 12:54:41 +0000 (07:54 -0500)
committerTejun Heo <tj@kernel.org>
Mon, 9 Feb 2015 12:54:41 +0000 (07:54 -0500)
commitb12aa1f25e1da7e23fa44f646ac46e41366cfc6c
tree465be1cfceaa37861f5629821e1be2559ba39cfb
parentf627cfdeb7d07df7d7ad2e6ebe59f25d8af4212e
parent09c32aaa3683cbcb6c2787a42f87630dff37d2a5
Merge branch 'for-3.19-fixes' of git://git./linux/kernel/git/tj/libata into for-3.20

09c32aaa3683 ("ahci_xgene: Fix the dma state machine lockup for the
ATA_CMD_SMART PIO mode command.") missed 3.19 release.  Fold it into
for-3.20.

Signed-off-by: Tejun Heo <tj@kernel.org>
drivers/ata/Kconfig
drivers/ata/ahci_xgene.c
drivers/ata/libata-core.c
drivers/ata/libata-scsi.c
include/linux/libata.h