Merge branch 'misc' into release

Conflicts:
	include/acpi/acpixf.h

Signed-off-by: Len Brown <len.brown@intel.com>

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

diff --cc drivers/acpi/acpica/tbutils.c
Simple merge

diff --cc drivers/acpi/pci_link.c
Simple merge

diff --cc drivers/acpi/video.c
Simple merge

diff --cc include/acpi/acpixf.h
index 7c7074f20087ad1b7073a2f9ba54a790fcc8bb96,05d2614e00782919cd0ce065f9871f6673a9a9f4..c8e8cf45830f6c5203f5d7e13f1531ff949d34ce
--- 1/include/acpi/acpixf.h
--- 2/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@@ -52,24 -48,7 +52,25 @@@
  #include "actypes.h"
  #include "actbl.h"
  
 +extern u8 acpi_gbl_permanent_mmap;
 +
 +/*
 + * Globals that are publically available, allowing for
 + * run time configuration
 + */
 +extern u32 acpi_dbg_level;
 +extern u32 acpi_dbg_layer;
 +extern u8 acpi_gbl_enable_interpreter_slack;
 +extern u8 acpi_gbl_all_methods_serialized;
 +extern u8 acpi_gbl_create_osi_method;
 +extern u8 acpi_gbl_leave_wake_gpes_disabled;
 +extern acpi_name acpi_gbl_trace_method_name;
 +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
   */