| commit | f89b2b5ddcace8959f760c0556369bd19bda0548 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Tue Aug 22 06:10:49 2006 -0400 |
| committer | Jeff Garzik <jeff@garzik.org> | Tue Aug 22 06:10:49 2006 -0400 |
| tree | 520c9530340056a9cc3f86f65027d22fd401b0a4 | |
| parent | 7796705244d1f04053acf24bee7eb2983f9cfeaf [diff] | |
| parent | f1a58ecae527fc67c87ce4dcb9e73894f64aadfe [diff] |
Merge branch 'upstream-fixes' into upstream Conflicts: drivers/ata/ata_piix.c