projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a05c31 c3bf5bb a684c5b)
Merge branches 'pm-core' and 'pm-misc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Aug 2017 18:29:45 +0000 (20:29 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Aug 2017 18:29:45 +0000 (20:29 +0200)
* pm-core:
  PM / runtime: Document new pm_runtime_set_suspended() constraint

* pm-misc:
  thunderbolt: icm: Ignore mailbox errors in icm_suspend()


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.