diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-13 16:20:07 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-13 16:20:07 +0100 |
| commit | 654b0c9627bc1b34cc21643afa8ac359c50db7d7 (patch) | |
| tree | f25069e2987e6d61793585adf969f42f9380afcd /kernel/power/Makefile | |
| parent | d031e1de2c5ba91e67ed83f6adf624543ab2b03d (diff) | |
| parent | d020283dc694c9ec31b410f522252f7a8397e67d (diff) | |
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 'kernel/power/Makefile')
0 files changed, 0 insertions, 0 deletions