Merge branch 'dock' into test

Conflicts:
	drivers/acpi/osl.c

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/acpi/osl.c
index 1420a9f69e5d0cbf11014197a843bd56a6cad4a1,750e0df15604e13a979684801ffc13e0c3ce7873..6234d3e7acd33e1e4e5f5e31c1c97446454f2abd
--- 1/drivers/acpi/osl.c
--- 2/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@@ -726,11 -743,19 +743,19 @@@ static acpi_status __acpi_os_execute(ac
        dpc->function = function;
        dpc->context = context;
  
-       INIT_WORK(&dpc->work, acpi_os_execute_deferred);
-       queue = (type == OSL_NOTIFY_HANDLER) ? kacpi_notify_wq : kacpid_wq;
-       if (!queue_work(queue, &dpc->work)) {
+       if (!hp) {
+               INIT_WORK(&dpc->work, acpi_os_execute_deferred);
+               queue = (type == OSL_NOTIFY_HANDLER) ?
+                       kacpi_notify_wq : kacpid_wq;
+               ret = queue_work(queue, &dpc->work);
+       } else {
+               INIT_WORK(&dpc->work, acpi_os_execute_hp_deferred);
+               ret = schedule_work(&dpc->work);
+       }
+ 
+       if (!ret) {
 -              ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
 -                        "Call to queue_work() failed.\n"));
 +              printk(KERN_ERR PREFIX
 +                        "Call to queue_work() failed.\n");
                status = AE_ERROR;
                kfree(dpc);
        }

diff --cc include/acpi/acpi_drivers.h
Simple merge