diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-12-07 02:17:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-12-07 02:17:17 +0100 |
| commit | d89d7ff9edf58cbf8ad0f490694b2edea8eb3a39 (patch) | |
| tree | 4fc5789486ca9ee0dad37c5fbee330d1484a2d58 /Documentation/power | |
| parent | 7b06a6d7bff563d82ddf8769617632f26793a83e (diff) | |
| parent | 013c074f8642d8e815ad670601f8e27155a74b57 (diff) | |
| parent | 5de85b9d57aba3ed2e04759e6db3b9e826dd0b06 (diff) | |
Merge branches 'pm-sleep' and 'pm-runtime' into pm-core