Merge branch 'misc-2.6.32' into release
Len Brown [Sat, 19 Sep 2009 06:14:45 +0000 (02:14 -0400)]
Conflicts:
drivers/pci/dmar.c

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

1  2 
drivers/acpi/bus.c
drivers/acpi/ec.c
drivers/acpi/pci_slot.c
drivers/acpi/video.c
drivers/pci/dmar.c
drivers/platform/x86/hp-wmi.c
include/linux/acpi.h

Simple merge
Simple merge
Simple merge
Simple merge
  #include <linux/timer.h>
  #include <linux/irq.h>
  #include <linux/interrupt.h>
 +#include <linux/tboot.h>
+ #include <linux/dmi.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
Simple merge