diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-09 23:54:09 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-09 23:54:09 +0100 |
commit | 3ed3c7b559f3cae7a5a92860a127ceb0cafd5a9c (patch) | |
tree | c8ab8e608222f07edf46a42e6ec3cb27ac4ceaa0 /kernel/power/main.c | |
parent | e470d06655e00749f6f9372e4fa4f20cea7ed7c5 (diff) | |
parent | d020283dc694c9ec31b410f522252f7a8397e67d (diff) | |
download | talos-op-linux-3ed3c7b559f3cae7a5a92860a127ceb0cafd5a9c.tar.gz talos-op-linux-3ed3c7b559f3cae7a5a92860a127ceb0cafd5a9c.zip |
Merge commit 'pm-fixes-for-3.3-rc3' into pm-sleep
New material in the pm-sleep branch depends on recent
power management fixes.
Diffstat (limited to 'kernel/power/main.c')
0 files changed, 0 insertions, 0 deletions