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	[PATCH] ide_cs: Add IBM microdrive to known IDs	2006-05-15 11:20:58 -07:00
mips	[PATCH] handle errors returned by platform_get_irq*()	2006-03-20 13:42:57 -08:00
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	[PATCH] ide-cd: quiet down GPCMD_READ_CDVD_CAPACITY failure	2006-03-27 09:29:02 +02:00
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	[PATCH] s/;;/;/g	2006-03-24 07:33:24 -08:00
ide-floppy.c	[PATCH] sem2mutex: drivers/ide	2006-03-23 07:38:14 -08:00
ide-generic.c
ide-io.c
ide-iops.c
ide-lib.c
ide-pnp.c
ide-probe.c	[PATCH] ide: Allow IDE interface to specify its not capable of 32-bit operations	2006-03-24 07:33:28 -08:00
ide-proc.c
ide-tape.c	[PATCH] ide-tape: use time_after(), time_after_eq()	2006-03-28 09:16:07 -08:00
ide-taskfile.c	[PATCH] Ensure ide-taskfile calls any driver specific end_request function	2006-03-31 12:18:57 -08:00
ide-timing.h
ide.c	[PATCH] ide: fix section mismatch warning	2006-03-25 08:22:53 -08:00
Kconfig
Makefile
setup-pci.c	[PATCH] remove the obsolete IDEPCI_FLAG_FORCE_PDC	2006-04-19 09:13:53 -07:00