tree 4e87f75cb4d6d52668030e36b5d000e80eb5e5d3
parent 0ede470030a35847a8b213bbdafb29d77bca76da
parent a8d46b9e4e487301affe84fa53de40b890898604
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1412637470 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1412637470 +0200

Merge branch 'acpi-pm'

* acpi-pm:
  ACPI / sleep: Rework the handling of ACPI GPE wakeup from suspend-to-idle
  PM / sleep: Rename platform suspend/resume functions in suspend.c
  PM / sleep: Export dpm_suspend_late/noirq() and dpm_resume_early/noirq()