Jeff Garzik fec69a9748 Merge branch 'upstream-fixes' into upstream ... Conflicts: drivers/scsi/sata_sil24.c		2006-06-11 23:04:37 -04:00
..
aec62xx.c
alim15x3.c	[PATCH] alim15x3: ULI M-1573 south Bridge support	2006-04-19 09:13:53 -07:00
amd74xx.c	[PATCH] sata_nv: Add MCP61 support	2006-05-24 01:34:10 -04:00
atiixp.c	[PATCH] ide: ATI SB600 IDE support	2006-04-19 09:13:53 -07:00
cmd64x.c
cmd640.c
cs5520.c
cs5530.c
cs5535.c
cy82c693.c
generic.c	[PATCH] ide_generic_all_on() warning fix	2006-03-28 09:16:04 -08:00
hpt34x.c
hpt366.c
it821x.c
it8172.c
Makefile
ns87415.c
opti621.c
pdc202xx_new.c
pdc202xx_old.c	[PATCH] remove the obsolete IDEPCI_FLAG_FORCE_PDC	2006-04-19 09:13:53 -07:00
piix.c
rz1000.c
sc1200.c
serverworks.c
sgiioc4.c	[PATCH] sgiioc4: use mmio ops instead of port io	2006-05-31 16:27:11 -07:00
siimage.c
sis5513.c	[PATCH] Small fixes backported to old IDE SiS driver	2006-03-28 09:16:04 -08:00
sl82c105.c
slc90e66.c
triflex.c
trm290.c
via82cxxx.c