Merge branch 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 5 Jan 2013 23:36:17 +0000 (00:36 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 5 Jan 2013 23:36:17 +0000 (00:36 +0100)
commitf67ffa95836b31be5d8fe336aee3bfc6412c5696
tree444417975bd55480818ad40a723591465091c6dc
parent868b093505d6378df77bc2bb656af082330127a8
parent9f6d8f6ab26b42620a914d67f29822f9bba90233
Merge branch 'pm-sleep'

* pm-sleep:
  PM: Move disabling/enabling runtime PM to late suspend/early resume