tree 9bd7f0eb414bad882d3e7f59e742ac1a21e804c5
parent c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1
parent 156acb166ea9a43d7fcdf9b8051694ce4e91dbfc
author Linus Torvalds <torvalds@linux-foundation.org> 1320791058 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1320791058 -0800

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/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