tree 10272bc220589e9b5b44fa3843f8cc6c1284b95b
parent 079c1812a2848539b61351fe4b08902187e19019
parent 0bae5fd3330be0517fba697e6b228601d421fade
parent 216c4e9db4c9d1d2a382b42880442dc632cd47d9
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1495477925 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1495477925 +0200

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()