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: (49 commits) libata-sff: separate out BMDMA qc_issue libata-sff: prd is BMDMA specific libata-sff: ata_sff_[dumb_]qc_prep are BMDMA specific libata-sff: separate out BMDMA EH libata-sff: port_task is SFF specific libata-sff: ap->[last_]ctl are SFF specific libata-sff: rename ap->ops->drain_fifo() to sff_drain_fifo() libata-sff: introduce ata_sff_init/exit() and ata_sff_port_init() libata-sff: clean up BMDMA initialization libata-sff: clean up inheritance in several drivers libata-sff: reorder SFF/BMDMA functions sata_inic162x: kill PORT_PRD_ADDR initialization libata: kill ATA_FLAG_DISABLED libata-sff: kill unused prototype and make ata_dev_select() static libata-sff: update bmdma host bus error handling sata_mv: remove unnecessary initialization sata_inic162x: inic162x is not dependent on CONFIG_ATA_SFF pata_sch: use ata_pci_sff_init_one() pata_sil680: Do our own exec_command posting libata: Remove excess delay in the tf_load path ...
No related branches found
No related tags found
Showing
- Documentation/DocBook/libata.tmpl 14 additions, 4 deletionsDocumentation/DocBook/libata.tmpl
- drivers/ata/Kconfig 14 additions, 6 deletionsdrivers/ata/Kconfig
- drivers/ata/Makefile 2 additions, 1 deletiondrivers/ata/Makefile
- drivers/ata/ahci.c 318 additions, 2528 deletionsdrivers/ata/ahci.c
- drivers/ata/ahci.h 343 additions, 0 deletionsdrivers/ata/ahci.h
- drivers/ata/ahci_platform.c 192 additions, 0 deletionsdrivers/ata/ahci_platform.c
- drivers/ata/libahci.c 2216 additions, 0 deletionsdrivers/ata/libahci.c
- drivers/ata/libata-core.c 31 additions, 185 deletionsdrivers/ata/libata-core.c
- drivers/ata/libata-eh.c 3 additions, 3 deletionsdrivers/ata/libata-eh.c
- drivers/ata/libata-pmp.c 29 additions, 3 deletionsdrivers/ata/libata-pmp.c
- drivers/ata/libata-scsi.c 0 additions, 3 deletionsdrivers/ata/libata-scsi.c
- drivers/ata/libata-sff.c 826 additions, 785 deletionsdrivers/ata/libata-sff.c
- drivers/ata/libata.h 13 additions, 16 deletionsdrivers/ata/libata.h
- drivers/ata/pata_acpi.c 4 additions, 4 deletionsdrivers/ata/pata_acpi.c
- drivers/ata/pata_ali.c 1 addition, 1 deletiondrivers/ata/pata_ali.c
- drivers/ata/pata_at91.c 0 additions, 1 deletiondrivers/ata/pata_at91.c
- drivers/ata/pata_atiixp.c 1 addition, 1 deletiondrivers/ata/pata_atiixp.c
- drivers/ata/pata_bf54x.c 21 additions, 66 deletionsdrivers/ata/pata_bf54x.c
- drivers/ata/pata_cmd640.c 3 additions, 10 deletionsdrivers/ata/pata_cmd640.c
- drivers/ata/pata_cs5520.c 1 addition, 1 deletiondrivers/ata/pata_cs5520.c
Loading
Please register or sign in to comment