]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* pm-sleep:
  PM / sleep: trace events for device PM callbacks
  PM / sleep: trace events for suspend/resume

1  2 
kernel/cpu.c

diff --cc kernel/cpu.c
Simple merge