From: Rafael J. Wysocki Date: Sun, 18 Aug 2013 22:28:14 +0000 (+0200) Subject: Merge branch 'pm-sleep' X-Git-Tag: next-20130822~82^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ef27e02fd46b49e60965ad70c4b02865db25393b;p=karo-tx-linux.git Merge branch 'pm-sleep' * pm-sleep: PM / Sleep: new trace event to print device suspend and resume times PM / Sleep: increase ftrace coverage in suspend/resume --- ef27e02fd46b49e60965ad70c4b02865db25393b