From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 11 Sep 2006 14:54:14 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.18-rc7~12
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3f2f1257ff6327e330d9e4f0ba1a48a73b0044dc;p=~emulex%2Finfiniband.git

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
---

3f2f1257ff6327e330d9e4f0ba1a48a73b0044dc