Jeff Garzik fec69a9748 Merge branch 'upstream-fixes' into upstream ... Conflicts: drivers/scsi/sata_sil24.c		2006-06-11 23:04:37 -04:00
..
arm
cris
h8300
legacy
mips
pci	Merge branch 'upstream-fixes' into upstream	2006-06-11 23:04:37 -04:00
ppc
ide-cd.c
ide-cd.h
ide-disk.c
ide-dma.c
ide-floppy.c
ide-generic.c
ide-io.c
ide-iops.c
ide-lib.c
ide-pnp.c
ide-probe.c
ide-proc.c
ide-tape.c
ide-taskfile.c
ide-timing.h
ide.c
Kconfig
Makefile
setup-pci.c