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

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cris

[PATCH] CRIS IDE driver

2005-07-27 16:26:02 -07:00

h8300

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

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

[PATCH] ide-cd: remove write-only cmd field from struct cdrom_info

2005-12-15 02:20:49 +01:00

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

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ide-io.c

[PATCH] drivers/ide/ide-io.c: make __ide_end_request() static

2006-02-03 08:32:12 -08:00

ide-iops.c

[PATCH] solve false-positive soft lockup messages during IDE init

2006-02-03 08:32:12 -08:00

ide-lib.c

[PATCH] ide: fix ide_toggle_bounce() to not try to bounce if we have an IOMMU

2005-11-18 23:13:33 +01:00

ide-pnp.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ide-probe.c

[SPARC]: Kill __irq_itoa().

2006-06-20 01:21:29 -07:00

ide-proc.c

Cleaned up AMD Au1200 IDE driver:

2005-10-29 19:32:20 +01:00

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

[PATCH] janitor: ide: min/max macros in ide-timing.h

2005-09-10 10:06:31 -07:00

ide.c

[PATCH] ide: fix section mismatch warning

2006-03-25 08:22:53 -08:00

Kconfig

[PATCH] IDE: always enable CONFIG_PDC202XX_FORCE

2006-02-03 08:32:13 -08:00

Makefile

[IDE] Add driver for Sibyte Swarm evaluation board

2005-11-17 16:23:50 +00:00

setup-pci.c

[SPARC]: Kill __irq_itoa().

2006-06-20 01:21:29 -07:00