From: Len Brown <len.brown@intel.com>
Date: Sat, 19 Sep 2009 04:37:13 +0000 (-0400)
Subject: Merge branch 'sfi-base' into release
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=003d6a38ce1a59e0053a02fd9e9a65b588bc8e33;p=linux.git

Merge branch 'sfi-base' into release

Conflicts:
	drivers/acpi/power.c

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

003d6a38ce1a59e0053a02fd9e9a65b588bc8e33
diff --cc drivers/acpi/power.c
index 5a09bf392ec1c,e86603f37deef..22b297916519d
--- a/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/pci/dmar.c
index ab99783dccec9,998f02d2ba42c..47aa5938fb043
--- a/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