Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 11 Sep 2006 12:54:55 +0000 (08:54 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 11 Sep 2006 12:54:55 +0000 (08:54 -0400)
commitdd1dc802368154a75926491092ec9e6a939c32df
treed30356622b57f9d993ff1c54a621c2d1f8cd31d9
parent406176ee7ef81cec3f346ecd41286a67148e3b0c
parent6708374178d225ef77571ed23b30e8a93c36add5
Merge branch 'upstream-fixes' into upstream

Conflicts:

drivers/ata/ata_piix.c
drivers/ata/ata_piix.c
drivers/ata/sata_mv.c