diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-25 15:13:16 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-25 15:13:16 +0100 |
| commit | 3269eb24f6f8a6c233dcfbee2947b99a786e8aad (patch) | |
| tree | 22830ba7504b3a6b173e64bca2ab9002ea8f8f01 | |
| parent | d4bec6d3e64c2b764546a3410c882eaf37374ee1 (diff) | |
| parent | 0b7c99d9a229c895fe4e6470af51612f3f4d2664 (diff) | |
| parent | e976eb4b91e906f20ec25b20c152d53c472fc3fd (diff) | |
| parent | 85c3ebd4a0510c0700e4f3e205bbb46757a53feb (diff) | |
Merge branches 'pm-misc', 'pm-sleep' and 'pm-cpuidle' into linux-next
* pm-misc:
mailmap: Add entry for <rjw@sisk.pl>
* pm-sleep:
PM: wakeup: Show statistics for deleted wakeup sources again
PM: sleep: Switch to rtc_time64_to_tm()/rtc_tm_to_time64()
* pm-cpuidle:
cpuidle: kirkwood: convert to devm_platform_ioremap_resource()
cpuidle: clps711x: convert to devm_platform_ioremap_resource()