]> 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)
commit145fec3d21edc343eeb8a281f1f79a78fe9090fd
tree465be1cfceaa37861f5629821e1be2559ba39cfb
parentddb4131f26e4c45d197c900ac1e10c792ee7938c
parent8712a8a48467365402063ddd9f2125f6cd8eb685
Merge branch 'for-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata into for-3.20

8712a8a48467 ("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