diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-06-18 11:47:58 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-06-18 11:47:58 +0200 |
commit | d1ece0998eeb7b6543044f32b7d9bcbaf6dc294a (patch) | |
tree | bcbb3dddee8b5db83f07585370b1bd57f92296ac /kernel/cpu_pm.c | |
parent | 76958a61e42fb6277a8431eb17e4bdb24176f1b7 (diff) | |
parent | 9c5da09d266ca9b32eb16cf940f8161d949c2fe5 (diff) |
Merge branch 'perf/urgent' into perf/core
Merge in all fixes before applying more changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/cpu_pm.c')
0 files changed, 0 insertions, 0 deletions