| commit | 04fc5fd39e09c460fd478ea84b34c445dd376759 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Tue, 22 May 2007 00:44:34 +0000 (21 17:44 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Tue, 22 May 2007 00:44:34 +0000 (21 17:44 -0700) | ||
| tree | 320731ed5046fc33f77ad957bb3fd7b5eaa4b5fe | treesnapshot (tar.gz zip) |
| parent | 8aee74c8ee875448cc6d1cf995c9469eb60ae515 | commitdiff |
| parent | 8bc3fc470eb25af4d70c72485cbcb130cc657691 | commitdiff |
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: bump versions
libata: Trim trailing whitespace
libata: Kiss post_set_mode goodbye
ata_piix: clean up
pata_hpt366: Enable bits are unreliable so don't use them
libata: Add Seagate STT20000A to DMA blacklist.
ahci: disable 64bit dma on sb600
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: bump versions
libata: Trim trailing whitespace
libata: Kiss post_set_mode goodbye
ata_piix: clean up
pata_hpt366: Enable bits are unreliable so don't use them
libata: Add Seagate STT20000A to DMA blacklist.
ahci: disable 64bit dma on sb600