aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pm.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-02-13 16:20:07 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2012-02-13 16:20:07 +0100
commit654b0c9627bc1b34cc21643afa8ac359c50db7d7 (patch)
treef25069e2987e6d61793585adf969f42f9380afcd /include/linux/pm.h
parentPM / QoS: Simplify PM QoS expansion/merge (diff)
parentPM / QoS: CPU C-state breakage with PM Qos change (diff)
downloadlinux-dev-654b0c9627bc1b34cc21643afa8ac359c50db7d7.tar.xz
linux-dev-654b0c9627bc1b34cc21643afa8ac359c50db7d7.zip
Merge commit 'pm-fixes-for-3.3-rc3' into pm-qos
New material in the pm-qos branch depends on recent power management fixes.
Diffstat (limited to 'include/linux/pm.h')
0 files changed, 0 insertions, 0 deletions