Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Tue, 22 Aug 2006 10:10:49 +0000 (06:10 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 22 Aug 2006 10:10:49 +0000 (06:10 -0400)
commitf89b2b5ddcace8959f760c0556369bd19bda0548
tree520c9530340056a9cc3f86f65027d22fd401b0a4
parent7796705244d1f04053acf24bee7eb2983f9cfeaf
parentf1a58ecae527fc67c87ce4dcb9e73894f64aadfe
Merge branch 'upstream-fixes' into upstream

Conflicts:

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