| commit | 3b7546211d53f600e15ca7867adbf3c085b8ecc9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 08 14:24:18 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 08 14:24:18 2011 -0800 |
| tree | 9bd7f0eb414bad882d3e7f59e742ac1a21e804c5 | |
| parent | c8f17084fe0fa7fdb5ff21eab9ccce49439ebdb1 [diff] | |
| parent | 156acb166ea9a43d7fcdf9b8051694ce4e91dbfc [diff] |
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