| commit | dd1dc802368154a75926491092ec9e6a939c32df | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Mon Sep 11 08:54:55 2006 -0400 |
| committer | Jeff Garzik <jeff@garzik.org> | Mon Sep 11 08:54:55 2006 -0400 |
| tree | d30356622b57f9d993ff1c54a621c2d1f8cd31d9 | |
| parent | 406176ee7ef81cec3f346ecd41286a67148e3b0c [diff] | |
| parent | 6708374178d225ef77571ed23b30e8a93c36add5 [diff] |
Merge branch 'upstream-fixes' into upstream Conflicts: drivers/ata/ata_piix.c