summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-16 15:18:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-16 15:18:17 -0800
commit1e8703b2e6aefba84dd9633d90a4093ff1200b93 (patch)
tree648c6a9ebd0ecfae1d5ef9c44e9996300b7232cd /include/linux
parent45314915ed8089634144c975357bf5ba17f06ab9 (diff)
parent00fafcda1773245a5292f953321ec3f0668c8c28 (diff)
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / PM QoS: Fix reversed min and max PM / OPP: Hide OPP configuration when SoCs do not provide an implementation PM: Allow devices to be removed during late suspend and early resume
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions