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

@ -30,8 +30,6 @@
#include <acpi/acpi.h>
#define PREFIX "ACPI: "
/* TBD: Make dynamic */
#define ACPI_MAX_HANDLES 10
struct acpi_handle_list {