From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 12 Jun 2014 11:43:08 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: v3.16-rc1~30^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d715a226b0b3dae48865d05e8c36175a8f75a809;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pm-sleep'

* pm-sleep:
  PM / sleep: trace events for device PM callbacks
  PM / sleep: trace events for suspend/resume
---

d715a226b0b3dae48865d05e8c36175a8f75a809