Merge branch 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 12 Jun 2014 11:43:08 +0000 (13:43 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 12 Jun 2014 11:43:08 +0000 (13:43 +0200)
commitd715a226b0b3dae48865d05e8c36175a8f75a809
tree996e45c4075f8e3032daeea8de7bd355fde3cc00
parent589e18a973bd6bb8abd2c6d4d8a1dcf5ae1dff61
parente8bca479c3f269ebb3a3acea5ef63314bb677060
Merge branch 'pm-sleep'

* pm-sleep:
  PM / sleep: trace events for device PM callbacks
  PM / sleep: trace events for suspend/resume
kernel/cpu.c