From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Sep 2009 16:34:07 +0000 (-0700)
Subject: Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb... 
X-Git-Tag: v2.6.32-rc1~170
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=746942d06acdb4dd78d16baa5f3728a48a033bdd;p=~emulex%2Finfiniband.git

Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6

* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
  SFI: remove unneeded includes
  sfi: Remove unused code
  SFI: Hook PCI MMCONFIG
  x86: add arch-specific SFI support
  SFI: add capability to parse ACPI tables
  SFI: add platform-independent core support
  SFI: create linux/sfi.h
  SFI: Simple Firmware Interface - MAINTAINERS, Kconfig
---

746942d06acdb4dd78d16baa5f3728a48a033bdd