Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ahci: sis can't do PMP ata_piix: add TECRA M4 to broken suspend list LIBATA: Add HAVE_PATA_PLATFORM to select PATA_PLATFORM driver sata_mv: warn on PIO with multiple DRQs sata_mv: enable async_notify for 60x1 Rev.C0 and higher libata: don't check whether to use DMA or not for no data commands ahci: jmb361 has only one port
Showing
- drivers/ata/Kconfig 9 additions, 1 deletiondrivers/ata/Kconfig
- drivers/ata/ahci.c 20 additions, 3 deletionsdrivers/ata/ahci.c
- drivers/ata/ata_piix.c 7 additions, 0 deletionsdrivers/ata/ata_piix.c
- drivers/ata/libata-core.c 2 additions, 2 deletionsdrivers/ata/libata-core.c
- drivers/ata/libata-scsi.c 7 additions, 9 deletionsdrivers/ata/libata-scsi.c
- drivers/ata/libata.h 1 addition, 1 deletiondrivers/ata/libata.h
- drivers/ata/sata_mv.c 21 additions, 0 deletionsdrivers/ata/sata_mv.c
Loading
Please register or sign in to comment