OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
cf9b59e9d3
linux/drivers/ata
History
Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree 
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
ahci_platform.c ahci_platform: properly set up EM messaging 2010-05-14 17:35:51 -04:00
ahci.c ahci: EM message type auto detect 2010-05-14 17:35:51 -04:00
ahci.h ahci: add "em_buffer" attribute for AHCI hosts 2010-05-14 17:35:51 -04:00
ata_generic.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
ata_piix.c Merge branch 'master' into for-next 2010-04-23 02:08:44 +02:00
Kconfig sata_inic162x: inic162x is not dependent on CONFIG_ATA_SFF 2010-05-14 22:38:40 -04:00
libahci.c ahci: add "em_buffer" attribute for AHCI hosts 2010-05-14 17:35:51 -04:00
libata-acpi.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
libata-core.c libata-sff: port_task is SFF specific 2010-05-19 13:35:49 -04:00
libata-eh.c libata-sff: separate out BMDMA EH 2010-05-19 13:36:46 -04:00
libata-pmp.c [libata] Disable R_OK (Early ACK) on SII 3726 PMP 2010-05-14 17:08:02 -04:00
libata-scsi.c libata: kill ATA_FLAG_DISABLED 2010-05-17 22:49:02 -04:00
libata-sff.c libata-sff: separate out BMDMA qc_issue 2010-05-19 13:38:55 -04:00
libata.h libata-sff: separate out BMDMA EH 2010-05-19 13:36:46 -04:00
Makefile ahci: Add platform driver 2010-05-14 17:08:01 -04:00
pata_acpi.c libata-sff: separate out BMDMA qc_issue 2010-05-19 13:38:55 -04:00
pata_ali.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
pata_amd.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_artop.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_at32.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pata_at91.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
pata_atiixp.c libata-sff: ata_sff_[dumb_]qc_prep are BMDMA specific 2010-05-19 13:36:50 -04:00
pata_atp867x.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pata_bf54x.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
pata_cmd64x.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_cmd640.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
pata_cs5520.c libata-sff: ata_sff_[dumb_]qc_prep are BMDMA specific 2010-05-19 13:36:50 -04:00
pata_cs5530.c libata-sff: separate out BMDMA qc_issue 2010-05-19 13:38:55 -04:00
pata_cs5535.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_cs5536.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_cypress.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_efar.c pata_efar: Enable parallel scanning 2010-03-01 15:07:21 -05:00
pata_hpt3x2n.c libata-sff: separate out BMDMA qc_issue 2010-05-19 13:38:55 -04:00
pata_hpt3x3.c
pata_hpt37x.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
pata_hpt366.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
pata_icside.c libata-sff: separate out BMDMA EH 2010-05-19 13:36:46 -04:00
pata_isapnp.c
pata_it821x.c libata-sff: separate out BMDMA qc_issue 2010-05-19 13:38:55 -04:00
pata_it8213.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_ixp4xx_cf.c
pata_jmicron.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_legacy.c
pata_macio.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
pata_marvell.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_mpc52xx.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
pata_mpiix.c
pata_netcell.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_ninja32.c
pata_ns87410.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_ns87415.c libata-sff: prd is BMDMA specific 2010-05-19 13:38:54 -04:00
pata_octeon_cf.c libata: kill ATA_FLAG_DISABLED 2010-05-17 22:49:02 -04:00
pata_of_platform.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
pata_oldpiix.c libata-sff: separate out BMDMA qc_issue 2010-05-19 13:38:55 -04:00
pata_opti.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_optidma.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_palmld.c
pata_pcmcia.c Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 2010-05-20 09:27:37 -07:00
pata_pdc202xx_old.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
pata_pdc2027x.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
pata_piccolo.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_platform.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
pata_qdi.c
pata_radisys.c libata-sff: separate out BMDMA qc_issue 2010-05-19 13:38:55 -04:00
pata_rb532_cf.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pata_rdc.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pata_rz1000.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_sc1200.c libata-sff: separate out BMDMA qc_issue 2010-05-19 13:38:55 -04:00
pata_scc.c libata-sff: prd is BMDMA specific 2010-05-19 13:38:54 -04:00
pata_sch.c pata_sch: use ata_pci_sff_init_one() 2010-05-14 22:38:38 -04:00
pata_serverworks.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
pata_sil680.c pata_sil680: Do our own exec_command posting 2010-05-14 22:34:30 -04:00
pata_sis.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_sl82c105.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_triflex.c libata: Pass host flags into the pci helper 2010-03-01 14:58:46 -05:00
pata_via.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
pata_winbond.c
pdc_adma.c libata-sff: ata_sff_[dumb_]qc_prep are BMDMA specific 2010-05-19 13:36:50 -04:00
sata_fsl.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
sata_inic162x.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
sata_mv.c libata-sff: separate out BMDMA qc_issue 2010-05-19 13:38:55 -04:00
sata_nv.c libata-sff: separate out BMDMA qc_issue 2010-05-19 13:38:55 -04:00
sata_promise.c libata-sff: prd is BMDMA specific 2010-05-19 13:38:54 -04:00
sata_promise.h
sata_qstor.c libata-sff: ata_sff_[dumb_]qc_prep are BMDMA specific 2010-05-19 13:36:50 -04:00
sata_sil24.c libata: kill ATA_FLAG_DISABLED 2010-05-17 22:49:02 -04:00
sata_sil.c libata-sff: prd is BMDMA specific 2010-05-19 13:38:54 -04:00
sata_sis.c
sata_svw.c libata-sff: prd is BMDMA specific 2010-05-19 13:38:54 -04:00
sata_sx4.c libata-sff: separate out BMDMA EH 2010-05-19 13:36:46 -04:00
sata_uli.c libata-sff: clean up BMDMA initialization 2010-05-19 13:32:19 -04:00
sata_via.c sata_via: Delay on vt6420 when starting ATAPI DMA write 2010-03-01 15:19:21 -05:00
sata_vsc.c libata: kill ATA_FLAG_DISABLED 2010-05-17 22:49:02 -04:00
sis.h