diff options
author | 2012-02-13 16:20:07 +0100 | |
---|---|---|
committer | 2012-02-13 16:20:07 +0100 | |
commit | 654b0c9627bc1b34cc21643afa8ac359c50db7d7 (patch) | |
tree | f25069e2987e6d61793585adf969f42f9380afcd /include/linux/pm.h | |
parent | PM / QoS: Simplify PM QoS expansion/merge (diff) | |
parent | PM / QoS: CPU C-state breakage with PM Qos change (diff) | |
download | linux-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