Merge branch 'acpica' into release

Conflicts:
	drivers/acpi/acpica/aclocal.h

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

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/acpi/acpica/utinit.c b/drivers/acpi/acpica/utinit.c
index a39c93dac719..c1b1c803ea9b 100644
--- a/drivers/acpi/acpica/utinit.c
+++ b/drivers/acpi/acpica/utinit.c
@@ -117,6 +117,10 @@ void acpi_ut_subsystem_shutdown(void)
         /* Close the acpi_event Handling */
 
         acpi_ev_terminate();
+
+        /* Delete any dynamic _OSI interfaces */
+
+        acpi_ut_interface_terminate();
 #endif
 
         /* Close the Namespace */