diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-12-03 14:10:35 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-12-03 14:10:42 -0500 |
commit | 23ba90e328fd2326378447cafafa47defdfc83c2 (patch) | |
tree | c1febaf468e0255eedfbedf07a07d8178a0b5ac9 /arch/powerpc/kernel/swsusp_32.S | |
parent | e859cf8656043f158b4004ccc8cbbf1ba4f97177 (diff) | |
parent | 8ea339adc0a48236008e59dd21564d71c37b331c (diff) |
Merge branch 'perf/scripting' into perf/core
Merge reason: it's ready for v2.6.33.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/kernel/swsusp_32.S')
0 files changed, 0 insertions, 0 deletions