From: Rafael J. Wysocki Date: Thu, 12 Jun 2014 11:43:08 +0000 (+0200) Subject: Merge branch 'pm-sleep' X-Git-Tag: v5.15~17772^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d715a226b0b3dae48865d05e8c36175a8f75a809;p=mirror_ubuntu-kernels.git Merge branch 'pm-sleep' * pm-sleep: PM / sleep: trace events for device PM callbacks PM / sleep: trace events for suspend/resume --- d715a226b0b3dae48865d05e8c36175a8f75a809