Merge branch 'pm-runtime'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 19 Nov 2013 00:06:49 +0000 (01:06 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 19 Nov 2013 00:06:49 +0000 (01:06 +0100)
commit77aa26514a3858cabce748fa093d871b5a51d269
tree6625ffc28c4d1eef7f69818964f4e484e92fd3f2
parent6431b430973c1c6eb2597da1533764cb4f696526
parentaa1b9f13b3346352455bfdc343ecff7667b84ff5
Merge branch 'pm-runtime'

* pm-runtime:
  PM / Runtime: Fix error path for prepare
  PM / Runtime: Update documentation around probe|remove|suspend
drivers/base/power/main.c