Merge branch 'linus' into sfi-release

Conflicts:
	arch/x86/kernel/setup.c
	drivers/acpi/power.c
	init/main.c

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/setup.c
index d784ea2,a55f660..6c78868
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -990,10 -984,7 +985,9 @@@ void __init setup_arch(char **cmdline_p
         * Read APIC and some other early information from ACPI tables.
         */
        acpi_boot_init();
 +
 +      sfi_init();
  
- #if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
        /*
         * get boot-time SMP configuration:
         */

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

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

diff --cc drivers/acpi/power.c
index e86603f,5a09bf3..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 998f02d,ab99783..47aa593
--- 1/drivers/pci/dmar.c
--- 2/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@@ -33,8 -33,10 +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

diff --cc init/main.c
index 9f110fb,34971be..a208691
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -68,7 -68,7 +68,8 @@@
  #include <linux/async.h>
  #include <linux/kmemcheck.h>
  #include <linux/kmemtrace.h>
 +#include <linux/sfi.h>
+ #include <linux/shmem_fs.h>
  #include <trace/boot.h>
  
  #include <asm/io.h>