Merge branch 'sfi-base' into release

Conflicts:
	drivers/acpi/power.c

Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
Len Brown 2009-09-19 00:37:13 -04:00
commit 003d6a38ce
37 changed files with 96 additions and 12 deletions

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