From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 22 May 2017 18:32:05 +0000 (+0200)
Subject: Merge branches 'pm-sleep' and 'powercap'
X-Git-Tag: v4.12-rc3~29^2
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/bb47e964175e5fb4c163066e4373fac055fe5da0

Merge branches 'pm-sleep' and 'powercap'

* pm-sleep:
  PM / hibernate: Declare variables as static
  RTC: rtc-cmos: Fix wakeup from suspend-to-idle
  PM / wakeup: Fix up wakeup_source_report_event()

* powercap:
  PowerCap: Fix an error code in powercap_register_zone()
---

bb47e964175e5fb4c163066e4373fac055fe5da0