Merge branch 'wakeup-etc-rafael' into release

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

diff --cc drivers/acpi/wakeup.c
index c6cb68e0a80c9a16b2e0f7c6da451a8394edea66,f252d0de992276c620620dde0fef46ead4b861ff..ed6501452507ff73ee796fd07f29097987b0dd01
--- 1/drivers/acpi/wakeup.c
--- 2/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@@ -63,14 -64,15 +64,15 @@@ void acpi_disable_wakeup_devices(u8 sle
                        container_of(node, struct acpi_device, wakeup_list);
  
                if (!dev->wakeup.flags.valid
-                   || !(dev->wakeup.state.enabled || dev->wakeup.prepare_count)
-                   || (sleep_state > (u32) dev->wakeup.sleep_state))
+                   || sleep_state > (u32) dev->wakeup.sleep_state
+                   || !(device_may_wakeup(&dev->dev)
+                       || dev->wakeup.prepare_count))
                        continue;
  
 -              acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
 +              acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
                                ACPI_GPE_DISABLE);
  
-               if (dev->wakeup.state.enabled)
+               if (device_may_wakeup(&dev->dev))
                        acpi_disable_wakeup_device_power(dev);
        }
  }

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