]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-sleep-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Jul 2013 13:45:18 +0000 (15:45 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Jul 2013 13:45:18 +0000 (15:45 +0200)
* pm-sleep-next:
  PM / Sleep: new trace event to print device suspend and resume times
  PM / Sleep: increase ftrace coverage in suspend/resume


Trivial merge