Merge branch 'sfi-base' into release
Len Brown [Sat, 19 Sep 2009 04:37:13 +0000 (00:37 -0400)]
Conflicts:
drivers/acpi/power.c

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

1  2 
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

Simple merge
Simple merge
  #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"
Simple merge
  #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
Simple merge