From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 7 Dec 2007 20:53:15 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.24-rc5~24
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=94545baded0bfbabdc30a3a4cb48b3db479dd6ef;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:
  libata: kill spurious NCQ completion detection
  ahci: don't attach if ICH6 is in combined mode
  ata_piix: add Toshiba Tecra M4 to broken suspend list
  ahci: fix engine reset failed message
---

94545baded0bfbabdc30a3a4cb48b3db479dd6ef