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: (21 commits) libata: bump transfer chunk size if it's odd libata: Return proper ATA INT status in pata_bf54x driver pata_ali: trim trailing whitespace (fix checkpatch complaints) pata_isapnp: Polled devices pata_hpt37x: Fix cable detect bug spotted by Sergei pata_ali: Lots of problems still showing up with small ATAPI DMA pata_ali: Add Mitac 8317 and derivatives libata-core: List more documentation sources for reference ata_piix: Invalid use of writel/readl with iomap sata_sil24: fix sg table sizing pata_jmicron: fix disabled port handling in jmicron_pre_reset() pata_sil680: kill bogus reset code (take 2) ata_piix: port enable for the first SATA controller of ICH8 is 0xf not 0x3 ata_piix: only enable the first port on apple macbook pro ata_piix: reorganize controller IDs pata_sis.c: Add Packard Bell EasyNote K5305 to laptops libata-scsi: be tolerant of 12-byte ATAPI commands in 16-byte CDBs libata: use ATA_HORKAGE_STUCK_ERR for ATAPI tape drives libata: workaround DRQ=1 ERR=1 for ATAPI tape drives libata: remove unused functions ...
Showing
- drivers/ata/ata_piix.c 64 additions, 29 deletionsdrivers/ata/ata_piix.c
- drivers/ata/libata-core.c 24 additions, 84 deletionsdrivers/ata/libata-core.c
- drivers/ata/libata-eh.c 0 additions, 95 deletionsdrivers/ata/libata-eh.c
- drivers/ata/libata-scsi.c 34 additions, 4 deletionsdrivers/ata/libata-scsi.c
- drivers/ata/pata_ali.c 20 additions, 0 deletionsdrivers/ata/pata_ali.c
- drivers/ata/pata_bf54x.c 3 additions, 3 deletionsdrivers/ata/pata_bf54x.c
- drivers/ata/pata_hpt37x.c 1 addition, 1 deletiondrivers/ata/pata_hpt37x.c
- drivers/ata/pata_isapnp.c 7 additions, 4 deletionsdrivers/ata/pata_isapnp.c
- drivers/ata/pata_jmicron.c 4 additions, 5 deletionsdrivers/ata/pata_jmicron.c
- drivers/ata/pata_sil680.c 2 additions, 30 deletionsdrivers/ata/pata_sil680.c
- drivers/ata/pata_sis.c 1 addition, 0 deletionsdrivers/ata/pata_sis.c
- drivers/ata/sata_sil24.c 23 additions, 3 deletionsdrivers/ata/sata_sil24.c
- include/linux/libata.h 1 addition, 4 deletionsinclude/linux/libata.h
Loading
Please register or sign in to comment