Merge branch 'sfi-base' into release
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 04:37:13 +0000 (00:37 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 04:37:13 +0000 (00:37 -0400)
commit003d6a38ce1a59e0053a02fd9e9a65b588bc8e33
treec9b941f4798a2accca200b0b01c07353ce5b07e1
parent71fd68e7d234f6b7d8407c8f486764d24f8411f4
parente55a5999ffcf72dc4d43d73618957964cb87065a
Merge branch 'sfi-base' into release

Conflicts:
drivers/acpi/power.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/blacklist.c
drivers/acpi/pci_root.c
drivers/acpi/power.c
drivers/acpi/video.c
drivers/pci/dmar.c
include/acpi/acpi_bus.h