Merge branch 'misc-2.6.32' into release

Conflicts:
	drivers/pci/dmar.c

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

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

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

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

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

diff --cc drivers/pci/dmar.c
index 47aa593,4484ac0..5f6b915
--- 1/drivers/pci/dmar.c
--- 2/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@@ -33,9 -33,10 +33,10 @@@
  #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

diff --cc drivers/platform/x86/hp-wmi.c
Simple merge

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