diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-23 16:15:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-23 16:15:58 +0200 |
| commit | 8ce26169555cf5634263d39d3665e45300218a5e (patch) | |
| tree | fa3dcd7da5af214001e9952bb376e4f0ead8c841 /kernel/power/main.c | |
| parent | 3cb6d1540880e767d911b79eb49578de2190f428 (diff) | |
| parent | 559fa6e76b271b98ff641fa2a968aa2439e43c28 (diff) | |
Merge commit '559fa6e76b27' into perf/urgent
Merge reason: this commit was queued up quite some time ago but was
forgotten about.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/power/main.c')
0 files changed, 0 insertions, 0 deletions