diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-09-06 06:11:38 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-06 06:11:42 +0200 |
commit | ed011b22ce567eabefa9ea571d3721c10ecd0553 (patch) | |
tree | c7aee6684613075c772388a99a9137014549434e /arch/s390/power/swsusp.c | |
parent | ring-buffer: only enable ring_buffer_swap_cpu when needed (diff) | |
parent | Linux 2.6.31-rc9 (diff) | |
download | linux-ed011b22ce567eabefa9ea571d3721c10ecd0553.tar.xz linux-ed011b22ce567eabefa9ea571d3721c10ecd0553.zip |
Merge commit 'v2.6.31-rc9' into tracing/core
Merge reason: move from -rc5 to -rc9.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/s390/power/swsusp.c')
0 files changed, 0 insertions, 0 deletions