Merge branch 'acpi-pm'

* acpi-pm:
  PM / core: Drop run_wake flag from struct dev_pm_info
  PCI / PM: Simplify device wakeup settings code
  PCI / PM: Drop pme_interrupt flag from struct pci_dev
  ACPI / PM: Consolidate device wakeup settings code
  ACPI / PM: Drop run_wake from struct acpi_device_wakeup_flags
  ACPI / sleep: EC-based wakeup from suspend-to-idle on recent systems
  platform: x86: intel-hid: Wake up the system from suspend-to-idle
  platform: x86: intel-vbtn: Wake up the system from suspend-to-idle
  ACPI / PM: Ignore spurious SCI wakeups from suspend-to-idle
  platform/x86: Add driver for ACPI INT0002 Virtual GPIO device
  PCI / PM: Restore PME Enable if skipping wakeup setup
  PM / sleep: Print timing information if debug is enabled
  ACPI / PM: Clean up device wakeup enable/disable code
  ACPI / PM: Change log level of wakeup-related message
  USB / PCI / PM: Allow the PCI core to do the resume cleanup
  ACPI / PM: Run wakeup notify handlers synchronously

Conflicts:
	drivers/base/power/main.c

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

diff --cc drivers/base/power/main.c
index 6add28799f6df0e580bb21ff7a25675793bf89ed,ef5b6a6e504512668c96682f74cfd0616f846af1..c99f8730de82a7fc08051c4f292cfc414017d9f3
--- 1/drivers/base/power/main.c
--- 2/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@@ -418,8 -417,8 +418,9 @@@ static void pm_dev_err(struct device *d
                dev_name(dev), pm_verb(state.event), info, error);
  }
  
 -static void dpm_show_time(ktime_t starttime, pm_message_t state, char *info)
+ #ifdef CONFIG_PM_DEBUG
 +static void dpm_show_time(ktime_t starttime, pm_message_t state,
 +                        const char *info)
  {
        ktime_t calltime;
        u64 usecs64;
@@@ -435,9 -434,12 +436,13 @@@
                info ?: "", info ? " " : "", pm_verb(state.event),
                usecs / USEC_PER_MSEC, usecs % USEC_PER_MSEC);
  }
 -static inline void dpm_show_time(ktime_t starttime, pm_message_t state, char *info) {}
+ #else
++static inline void dpm_show_time(ktime_t starttime, pm_message_t state,
++                               const char *info) {}
+ #endif /* CONFIG_PM_DEBUG */
  
  static int dpm_run_callback(pm_callback_t cb, struct device *dev,
 -                          pm_message_t state, char *info)
 +                          pm_message_t state, const char *info)
  {
        ktime_t calltime;
        int error;

diff --cc drivers/base/power/wakeup.c
Simple merge

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