| commit | be94a4ba093c75e06b6fd2b0476f34812fbd359e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 05 11:53:44 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 05 11:53:44 2009 -0700 |
| tree | 0e6929aa585c3d5bf576f214457ab67dd02474f4 | |
| parent | a4e4b646eb62ca4ce755e2c17aef8f42c8608821 [diff] | |
| parent | 65e31643115349fd7a81acbe75ec4a54d5df8aad [diff] |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ata_piix: Add HP Compaq nc6000 to the broken poweroff list ahci: add warning messages for hp laptops with broken suspend pata_efar: fix PIO2 underclocking pata_legacy: wait for async probing