Merge branch 'sfi-base' into release

Conflicts:
	drivers/acpi/power.c

Signed-off-by: Len Brown <len.brown@intel.com>

diff --cc drivers/acpi/blacklist.c
Simple merge

diff --cc drivers/acpi/pci_root.c
Simple merge

diff --cc drivers/acpi/power.c
index 5a09bf3,e86603f..22b2979
--- 1/drivers/acpi/power.c
--- 2/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@@ -43,9 -43,9 +43,10 @@@
  #include <linux/seq_file.h>
  #include <acpi/acpi_bus.h>
  #include <acpi/acpi_drivers.h>
- 
 +#include "sleep.h"
  
+ #define PREFIX "ACPI: "
+ 
  #define _COMPONENT                    ACPI_POWER_COMPONENT
  ACPI_MODULE_NAME("power");
  #define ACPI_POWER_CLASS              "power_resource"

diff --cc drivers/acpi/video.c
Simple merge

diff --cc drivers/pci/dmar.c
index ab99783,998f02d..47aa593
--- 1/drivers/pci/dmar.c
--- 2/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@@ -33,10 -33,8 +33,9 @@@
  #include <linux/timer.h>
  #include <linux/irq.h>
  #include <linux/interrupt.h>
 +#include <linux/tboot.h>
  
- #undef PREFIX
- #define PREFIX "DMAR:"
+ #define PREFIX "DMAR: "
  
  /* No locks are needed as DMA remapping hardware unit
   * list is constructed at boot time and hotplug of

diff --cc include/acpi/acpi_bus.h
Simple merge