Merge branch 'misc-2.6.32' into release

Conflicts:
	drivers/pci/dmar.c

Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
Len Brown 2009-09-19 02:14:45 -04:00
commit d26f0528d5
9 changed files with 41 additions and 54 deletions

View file

@ -34,6 +34,7 @@
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/tboot.h>
#include <linux/dmi.h>
#define PREFIX "DMAR: "