From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Nov 2011 22:24:18 +0000 (-0800)
Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: firefly_0821_release~3680^2~4138
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3b7546211d53f600e15ca7867adbf3c085b8ecc9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/linux-pm

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR())
  PM / devfreq: fix private_data
  Documentation: Fix typo in freezer-subsystem.txt
  PM / QoS: Set cpu_dma_pm_qos->name
---

3b7546211d53f600e15ca7867adbf3c085b8ecc9