]> 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)
commit415ee51905b4520d2ce24ae8e28f7117fd22e007
tree10272bc220589e9b5b44fa3843f8cc6c1284b95b
parent3049422827384e7ce250a081d4960219cf8ac1e5
parent95ed9fbd42a79e78ac698da5e8ae809ad7e2cb71
parent9999640304bbe220b28e55163302e4d85e9c5ee1
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