git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f627cfd 09c32aa)
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)
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>
1  2 
drivers/ata/Kconfig patch | diff1 | diff2 | blob | history
drivers/ata/ahci_xgene.c patch | diff1 | diff2 | blob | history
drivers/ata/libata-core.c patch | diff1 | diff2 | blob | history
drivers/ata/libata-scsi.c patch | diff1 | diff2 | blob | history
include/linux/libata.h patch | diff1 | diff2 | blob | history

diff --cc drivers/ata/Kconfig
Simple merge
diff --cc drivers/ata/ahci_xgene.c
Simple merge
diff --cc drivers/ata/libata-core.c
Simple merge
diff --cc drivers/ata/libata-scsi.c
Simple merge
diff --cc include/linux/libata.h
Simple merge
Pandora Kernel Repository