Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 06:51:38 +0000 (02:51 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 06:51:38 +0000 (02:51 -0400)
commit54a86bfc3d4601be9c36cd4e8a1bdc580c98fa6a
tree41956fc365923a8c85037c51b8085076d7d8a303
parent81ce3c4b4d3771866ce74b1c3856b45c3e2549fc
parentac2164d5e425fa4755bdbab9641d8dab7239b6f5
Merge branch 'upstream-fixes' into upstream
drivers/ata/ata_piix.c
drivers/ata/sata_via.c