From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 Mar 2008 21:26:27 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.25-rc8~16
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a77df5cd1cde203ef11c8e5a3ca47def5f5a1687;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:
  libata: ATA_EHI_LPM should be ATA_EH_LPM
  pata_sil680: only enable MMIO on Cell blades
---

a77df5cd1cde203ef11c8e5a3ca47def5f5a1687