From: Len Brown <len.brown@intel.com>
Date: Sat, 19 Sep 2009 06:14:45 +0000 (-0400)
Subject: Merge branch 'misc-2.6.32' into release
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d26f0528d588e596955bf296a609afe52eafc099;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'misc-2.6.32' into release

Conflicts:
	drivers/pci/dmar.c

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

d26f0528d588e596955bf296a609afe52eafc099
diff --cc drivers/pci/dmar.c
index 47aa5938fb04,4484ac089772..5f6b915d0d82
--- a/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