tree 18824efee368b949865532bf9c478ab6031d3aae
parent ce63e1862ce81d85df9e3239e4467ac765e04962
parent 536446772f1181f3afdf332780b5325d1b6980c6
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1377560507 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1377560507 +0200

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