Merge branch 'pm-sleep'
commite894245c78b4d5b69074dc8d7f671770f513a4b6
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Aug 2013 23:41:47 +0000 (27 01:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Aug 2013 23:41:47 +0000 (27 01:41 +0200)
tree18824efee368b949865532bf9c478ab6031d3aae
parentce63e1862ce81d85df9e3239e4467ac765e04962
parent536446772f1181f3afdf332780b5325d1b6980c6
Merge branch 'pm-sleep'

* pm-sleep:
  PM / Sleep: new trace event to print device suspend and resume times
  PM / Sleep: increase ftrace coverage in suspend/resume