Merge branch 'acpica'

* acpica:
  ACPI: Clean up incorrect inclusions of ACPICA headers
  ACPICA: Update version to 20131115.
  ACPICA: Add support to delete all objects attached to the root namespace node.
  ACPICA: Delete all attached data objects during namespace node deletion.
  ACPICA: Resources: Fix loop termination for the get AML length function.
  ACPICA: Tests: Add CHECKSUM_ABORT protection for test utilities.
  ACPICA: Debug output: Do not emit function nesting level for kernel build.

diff --combined drivers/hwmon/asus_atk0110.c
index 1d7ff46812c3dc9d72abb977b02cbf4db04fbd2c,05fd83ece62ed1c13afbbeee1afb5a983af297b9..dafc63c6932dfa47001a0269fc283984c16c321e
--- 1/drivers/hwmon/asus_atk0110.c
--- 2/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
@@@ -18,7 -18,6 +18,6 @@@
  #include <linux/err.h>
  
  #include <acpi/acpi.h>
- #include <acpi/acpixf.h>
  #include <acpi/acpi_drivers.h>
  #include <acpi/acpi_bus.h>
  
@@@ -119,7 -118,7 +118,7 @@@ struct atk_data 
        acpi_handle rtmp_handle;
        acpi_handle rvlt_handle;
        acpi_handle rfan_handle;
 -      /* new inteface */
 +      /* new interface */
        acpi_handle enumerate_handle;
        acpi_handle read_handle;
        acpi_handle write_handle;