Jeff Garzik 71d530cd1b Merge branch 'master' into upstream ... Conflicts: drivers/scsi/libata-core.c drivers/scsi/libata-scsi.c include/linux/pci_ids.h		2006-06-22 22:11:56 -04:00
..
arm
cris
h8300
legacy	[PATCH] ide_cs: Add IBM microdrive to known IDs	2006-05-15 11:20:58 -07:00
mips
pci	Merge branch 'upstream-fixes' into upstream	2006-06-11 23:04:37 -04:00
ppc	[PATCH] powerpc: Fix ide-pmac sysfs entry	2006-05-21 12:59:16 -07:00
ide-cd.c
ide-cd.h
ide-disk.c	[PATCH] LED: Add IDE disk activity LED trigger	2006-03-31 12:18:57 -08:00
ide-dma.c
ide-floppy.c
ide-generic.c
ide-io.c
ide-iops.c
ide-lib.c
ide-pnp.c
ide-probe.c	[SPARC]: Kill __irq_itoa().	2006-06-20 01:21:29 -07:00
ide-proc.c
ide-tape.c
ide-taskfile.c
ide-timing.h
ide.c
Kconfig
Makefile
setup-pci.c	[SPARC]: Kill __irq_itoa().	2006-06-20 01:21:29 -07:00