From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 26 Aug 2013 23:41:47 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: v3.12-rc1~178^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e894245c78b4d5b69074dc8d7f671770f513a4b6;p=pandora-kernel.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
---

e894245c78b4d5b69074dc8d7f671770f513a4b6
Reading git-diff-tree failed