lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'misc-2.6.32' into release

Browse Source 
Conflicts:
	drivers/pci/dmar.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2009-09-19 02:14:45 -04:00
parent b963bd39c9 df43176c93
commit d26f0528d5
9 changed files with 42 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/pci/dmar.c
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: "