Merge branch 'acpica-gpe' into release

diff --cc drivers/acpi/acpica/acglobal.h
Simple merge

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

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

diff --cc drivers/acpi/wakeup.c
index dc6d1d9112fb58809a6db021a6eba031d7d2315b,c80537bc3234dd012a3e047907ad0c572b2e6f6a..f62a50c3ed3401e20fe7c0af8555584110cecb8e
--- 1/drivers/acpi/wakeup.c
--- 2/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@@ -40,12 -69,9 +41,12 @@@ void acpi_enable_wakeup_devices(u8 slee
                    || sleep_state > (u32) dev->wakeup.sleep_state)
                        continue;
  
 +              if (dev->wakeup.state.enabled)
 +                      acpi_enable_wakeup_device_power(dev, sleep_state);
 +
                /* The wake-up power should have been enabled already. */
-               acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
-                               ACPI_GPE_TYPE_WAKE);
+               acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
+                               ACPI_GPE_ENABLE);
        }
  }
  

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