Merge branch 'sfi-base' into release

Conflicts: drivers/acpi/power.c Signed-off-by: Len Brown <len.brown@intel.com>
2009-09-19 00:37:13 -04:00
parent 71fd68e7d2 e55a5999ff
commit 003d6a38ce
37 changed files with 96 additions and 12 deletions
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -34,6 +34,8 @@
 #include <acpi/acpi_bus.h>
 #include <linux/dmi.h>

+#include "internal.h"
+
 enum acpi_blacklist_predicates {
 	all_versions,
 	less_than_or_equal,