diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-02-28 13:00:50 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-02-28 13:00:50 +0300 |
| commit | 189c6967fe61729fa7e9cdc32690b08fc7eebe41 (patch) | |
| tree | b193917f9e4f958da908a4cd4cd46d5b5d2bfb85 /kernel | |
| parent | f5739cb0b56590d68d8df8a44659893b6d0084c3 (diff) | |
| parent | b0c609ab2057d0953fa05e7566f0c0e8a28fa9e1 (diff) | |
| parent | 1df97a02a937abf8473ccf0ef12edefcb11671de (diff) | |
| download | linux-189c6967fe61729fa7e9cdc32690b08fc7eebe41.tar.xz | |
Merge branches 'pm-sleep' and 'pm-devfreq'
* pm-sleep:
PM / hibernate: fix typo "reserverd_size" -> "reserved_size"
Documentation: power: Drop reference to interface.rst
* pm-devfreq:
Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs"