Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 11 Sep 2006 14:54:14 +0000 (07:54 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 11 Sep 2006 14:54:14 +0000 (07:54 -0700)
commit3f2f1257ff6327e330d9e4f0ba1a48a73b0044dc
treee64179c528521b544634e055a222e120e0987530
parent28a2a3f58707cba16b329b90f601c01599456491
parent6708374178d225ef77571ed23b30e8a93c36add5
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:
  [PATCH] ata_piix: add map 01b for ICH7M
  [libata] sata_mv: errata check buglet fix