diff options
| author | Rafael J. Wysocki | 2017-05-22 20:32:05 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2017-05-22 20:32:05 +0200 |
| commit | bb47e964175e5fb4c163066e4373fac055fe5da0 (patch) | |
| tree | 10272bc220589e9b5b44fa3843f8cc6c1284b95b /kernel | |
| parent | 079c1812a2848539b61351fe4b08902187e19019 (diff) | |
| parent | 0bae5fd3330be0517fba697e6b228601d421fade (diff) | |
| parent | 216c4e9db4c9d1d2a382b42880442dc632cd47d9 (diff) | |
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()