commit | 3f2f1257ff6327e330d9e4f0ba1a48a73b0044dc | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Sep 11 07:54:14 2006 -0700 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Sep 11 07:54:14 2006 -0700 |
tree | e64179c528521b544634e055a222e120e0987530 | |
parent | 28a2a3f58707cba16b329b90f601c01599456491 [diff] | |
parent | 6708374178d225ef77571ed23b30e8a93c36add5 [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: [PATCH] ata_piix: add map 01b for ICH7M [libata] sata_mv: errata check buglet fix