From: Rafael J. Wysocki Date: Mon, 29 Jul 2013 13:45:18 +0000 (+0200) Subject: Merge branch 'pm-sleep-next' into linux-next X-Git-Tag: next-20130731~69^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ea6bfc8052d658a21fb4a839ba4ff515fe3badbf;p=karo-tx-linux.git Merge branch 'pm-sleep-next' into linux-next * pm-sleep-next: PM / Sleep: new trace event to print device suspend and resume times PM / Sleep: increase ftrace coverage in suspend/resume --- ea6bfc8052d658a21fb4a839ba4ff515fe3badbf