| commit | 91396c1e2d73a041d86935fb8371e8d48b48b663 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu May 24 18:20:42 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu May 24 18:20:42 2007 -0700 |
| tree | 7000d66835f33dbc0e47954851daa71a88bb5b85 | |
| parent | 9059b454248a060ab39346c5d079f56089ab3868 [diff] | |
| parent | cf5792d20cdc9a88abf9984a2224f57de1952926 [diff] |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: pata_via: Handle laptops via DMI libata: -ENODEV during prereset isn't an error libata: don't consider 0xff as port empty if SStatus is available ata_piix: add short 40c quirk for Acer Aspire 2030, take #2 pata_sis: Fix and clean up some timing setups hpt3x2n: Correct revision boundary