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

Merge branch 'sfi-base' into release

Browse Source 
Conflicts:
	drivers/acpi/power.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2009-09-19 00:37:13 -04:00
parent 71fd68e7d2 e55a5999ff
commit 003d6a38ce
37 changed files with 96 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/pci/dmar.c
View File

@@ -35,8 +35,7 @@
#include <linux/interrupt.h>
#include <linux/tboot.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