tree 996e45c4075f8e3032daeea8de7bd355fde3cc00
parent 589e18a973bd6bb8abd2c6d4d8a1dcf5ae1dff61
parent e8bca479c3f269ebb3a3acea5ef63314bb677060
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1402573388 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1402573388 +0200

Merge branch 'pm-sleep'

* pm-sleep:
  PM / sleep: trace events for device PM callbacks
  PM / sleep: trace events for suspend/resume