]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ede470 a8d46b9)
Merge branch 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Oct 2014 23:17:50 +0000 (01:17 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Oct 2014 23:17:50 +0000 (01:17 +0200)
* 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()

1  2 
drivers/acpi/osl.c patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/osl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.