linux_dsm_epyc7002/drivers/ata
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
ahci.c [PATCH] ahci: ignore PORT_IRQ_IF_ERR on JMB controllers 2006-11-29 14:57:44 +09:00
ata_generic.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
ata_piix.c Revert "[PATCH] Add 0x7110 piix to ata_piix.c" 2006-11-01 22:09:21 -05:00
Kconfig [PATCH] ATA must depend on BLOCK 2006-10-21 15:10:10 -04:00
libata-core.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
libata-eh.c WorkStruct: Separate delayable and non-delayable events. 2006-11-22 14:54:01 +00:00
libata-scsi.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
libata-sff.c [PATCH] libata-sff: Allow for wacky systems 2006-10-21 15:18:59 -04:00
libata.h WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
Makefile [libata] Delete pata_it8172 driver 2006-09-20 17:48:53 -04:00
pata_ali.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_amd.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_artop.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_atiixp.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_cmd64x.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_cs5520.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_cs5530.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_cs5535.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_cypress.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_efar.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_hpt3x2n.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_hpt3x3.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_hpt37x.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_hpt366.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_isapnp.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_it821x.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_jmicron.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_legacy.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_mpiix.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_netcell.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_ns87410.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_oldpiix.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_opti.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_optidma.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_pcmcia.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_pdc202xx_old.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_pdc2027x.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_qdi.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_radisys.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_rz1000.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_sc1200.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_serverworks.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_sil680.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_sis.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_sl82c105.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_triflex.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pata_via.c [PATCH] libata: add missing sht->slave_destroy 2006-11-29 14:57:58 +09:00
pdc_adma.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sata_mv.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sata_nv.c [libata] sata_nv: Add PCI IDs 2006-11-01 05:23:11 -05:00
sata_promise.c Merge branch 'master' into upstream-fixes 2006-10-11 04:59:46 -04:00
sata_promise.h Move libata to drivers/ata. 2006-08-10 07:31:37 -04:00
sata_qstor.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sata_sil24.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sata_sil.c [PATCH] misc sata __iomem annotations 2006-10-10 15:37:21 -07:00
sata_sis.c [PATCH] sata_sis: fix flags handling for the secondary port 2006-10-31 20:26:10 -05:00
sata_svw.c [PATCH] misc sata __iomem annotations 2006-10-10 15:37:21 -07:00
sata_sx4.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sata_uli.c [libata] PCI ID table cleanup in various drivers 2006-09-28 20:21:59 -04:00
sata_via.c [libata] sata_via: fix obvious typo 2006-11-08 07:46:02 -05:00
sata_vsc.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00