Merge branch 'misc' into release

Conflicts:
	include/acpi/acpixf.h

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2009-01-09 03:37:48 -05:00
melakukan d0302bc62a
9 mengubah file dengan 27 tambahan dan 8 penghapusan

Melihat File

@@ -70,6 +70,7 @@ extern u32 acpi_gbl_trace_flags;
extern u32 acpi_current_gpe_count;
extern struct acpi_table_fadt acpi_gbl_FADT;
extern u32 acpi_rsdt_forced;
/*
* Global interfaces
*/