From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Apr 2009 18:46:04 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.30-rc2~70
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=eebb2afb82c4f999e850d198af26ce6969d0f47a;p=~emulex%2Finfiniband.git

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ata: fix obviously wrong comment
  ahci: force CAP_NCQ for earlier NV MCPs
  [libata] sata_via: kill uninit'd var warning
---

eebb2afb82c4f999e850d198af26ce6969d0f47a