| commit | 6f8e5850df8eecee212c84831030b04f025c11ac | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 9 Dec 2008 16:27:57 +0000 (9 08:27 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 9 Dec 2008 16:27:57 +0000 (9 08:27 -0800) | ||
| tree | 20f61ff763e83830993e18cfb726c18964622661 | treesnapshot (tar.gz zip) |
| parent | 21283f056fe10a022187a40c331100a1a9a90244 | commitdiff |
| parent | e3389cbc65ecc486d4aea2f0e9114abc0f849be2 | commitdiff |
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata: Fix experimental tags
pata_ninja32: update ID table
pata_sis: Remove bogus cable match
ATA: piix, fix pointer deref on suspend
pata_hpt366: fix clock detection
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata: Fix experimental tags
pata_ninja32: update ID table
pata_sis: Remove bogus cable match
ATA: piix, fix pointer deref on suspend
pata_hpt366: fix clock detection