diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 01:58:45 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 01:58:45 -0400 |
commit | 03418c7efaa429dc7647ac93e3862e3fe1816873 (patch) | |
tree | d5a101034139f846b700dfdf53eb6737ea6c4365 /arch/x86/power/hibernate_asm_32.S | |
parent | 4176935b58eeb636917e65a2c388e4607e36cce6 (diff) | |
parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'arch/x86/power/hibernate_asm_32.S')
0 files changed, 0 insertions, 0 deletions