diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-05 22:53:44 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-05 22:53:44 +0400 |
| commit | be94a4ba093c75e06b6fd2b0476f34812fbd359e (patch) | |
| tree | 0e6929aa585c3d5bf576f214457ab67dd02474f4 /crypto/salsa20_generic.c | |
| parent | a4e4b646eb62ca4ce755e2c17aef8f42c8608821 (diff) | |
| parent | 65e31643115349fd7a81acbe75ec4a54d5df8aad (diff) | |
| download | linux-be94a4ba093c75e06b6fd2b0476f34812fbd359e.tar.xz | |
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
Diffstat (limited to 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions