]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita0a021230b9a2a010de50246f42b45619577de8a
tree465be1cfceaa37861f5629821e1be2559ba39cfb
parent241f0ce9cb0096b86d34910453989636cf8ee446
parent332321947873605e93bc085ebdad0c2ea2802c0d
Merge branch 'for-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata into for-3.20

332321947873 ("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