diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-08-03 20:29:45 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-08-03 20:29:45 +0200 |
commit | 78aa904a773bfd008606c2065709e23173180ace (patch) | |
tree | a15505ff90a014f285f881f079d1fe311e4e6b3b /Documentation | |
parent | 8a05c3115dc0f239b46659d9d190e370d6413ff1 (diff) | |
parent | c3bf5bb521907e7b5a574ae7a2734df3acb11c2f (diff) | |
parent | a684c5b1887cbb95d624e33574fabf8a5ca599e9 (diff) | |
download | linux-78aa904a773bfd008606c2065709e23173180ace.tar.gz linux-78aa904a773bfd008606c2065709e23173180ace.tar.bz2 linux-78aa904a773bfd008606c2065709e23173180ace.zip |
Merge branches 'pm-core' and 'pm-misc'
* pm-core:
PM / runtime: Document new pm_runtime_set_suspended() constraint
* pm-misc:
thunderbolt: icm: Ignore mailbox errors in icm_suspend()