summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-08-03 21:29:45 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-08-03 21:29:45 +0300
commit78aa904a773bfd008606c2065709e23173180ace (patch)
treea15505ff90a014f285f881f079d1fe311e4e6b3b /drivers
parent8a05c3115dc0f239b46659d9d190e370d6413ff1 (diff)
parentc3bf5bb521907e7b5a574ae7a2734df3acb11c2f (diff)
parenta684c5b1887cbb95d624e33574fabf8a5ca599e9 (diff)
downloadlinux-78aa904a773bfd008606c2065709e23173180ace.tar.xz
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()