]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-sleep' and 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 22 May 2017 18:32:05 +0000 (20:32 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 22 May 2017 18:32:05 +0000 (20:32 +0200)
commite5253e2292a281ad1042f316420b1452a665a8ee
tree10272bc220589e9b5b44fa3843f8cc6c1284b95b
parent2f14e619a0594ea72e2f3dd8f3e99726742145eb
parentaf36961a472ef9fb74bf061a67c399cd966fbf4c
parentb9208030c2b68f47817f7621a049557e1d4179a6
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()
drivers/rtc/rtc-cmos.c
kernel/power/snapshot.c