Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 16:34:07 +0000 (09:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 16:34:07 +0000 (09:34 -0700)
commit746942d06acdb4dd78d16baa5f3728a48a033bdd
tree1470ffab015f6b7c2ff6f44314f9fab17d3a4c3f
parentc11f6c82581e8be4e1829c677db54e7f55cebece
parentc602c65b2f81d14456771d1e3f15d1381f4b7efa
Merge branch 'sfi-release' of git://git./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
MAINTAINERS
arch/x86/Kconfig
arch/x86/kernel/setup.c
init/main.c