Merge branch 'acpica' into release

Conflicts:
	drivers/acpi/acpica/aclocal.h

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

diff --combined include/acpi/acpixf.h
index 984cdc62e30bc52da4cef907f3dd5094aa5ffd71,12fe9797c0b13d6c6c823a6b40a310f39b3c352c..7db647c9628309ca8c2c74f02cabea1a6cc50ce6
--- 1/include/acpi/acpixf.h
--- 2/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@@ -47,7 -47,7 +47,7 @@@
  
  /* Current ACPICA subsystem version in YYYYMMDD format */
  
- #define ACPI_CA_VERSION                 0x20100702
+ #define ACPI_CA_VERSION                 0x20101013
  
  #include "actypes.h"
  #include "actbl.h"
@@@ -55,7 -55,7 +55,7 @@@
  extern u8 acpi_gbl_permanent_mmap;
  
  /*
 - * Globals that are publically available, allowing for
 + * Globals that are publicly available, allowing for
   * run time configuration
   */
  extern u32 acpi_dbg_level;
@@@ -72,6 -72,7 +72,7 @@@ extern u8 acpi_gbl_truncate_io_addresse
  
  extern u32 acpi_current_gpe_count;
  extern struct acpi_table_fadt acpi_gbl_FADT;
+ extern u8 acpi_gbl_system_awake_and_running;
  
  extern u32 acpi_rsdt_forced;
  /*
@@@ -105,6 -106,10 +106,10 @@@ const char *acpi_format_exception(acpi_
  
  acpi_status acpi_purge_cached_objects(void);
  
+ acpi_status acpi_install_interface(acpi_string interface_name);
+ 
+ acpi_status acpi_remove_interface(acpi_string interface_name);
+ 
  /*
   * ACPI Memory management
   */
@@@ -263,6 -268,8 +268,8 @@@ acpi_remove_gpe_handler(acpi_handle gpe
  acpi_status acpi_install_exception_handler(acpi_exception_handler handler);
  #endif
  
+ acpi_status acpi_install_interface_handler(acpi_interface_handler handler);
+ 
  /*
   * Event interfaces
   */