]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 18 Aug 2013 22:28:14 +0000 (00:28 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 18 Aug 2013 22:28:14 +0000 (00:28 +0200)
* pm-sleep:
  PM / Sleep: new trace event to print device suspend and resume times
  PM / Sleep: increase ftrace coverage in suspend/resume


Trivial merge