diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-31 10:03:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-31 10:03:27 +0200 |
| commit | 19c959627a3477a8487d08afd47fdc1f4fea60e5 (patch) | |
| tree | aaeda0f81bc100ce8f71af129f39b5f2e6e934bf /kernel/power/hibernate_nvs.c | |
| parent | 119e7a22bb70d84849384e5113792cd45afa4f85 (diff) | |
| parent | d498bc1f6261dd6f655440eb2f1c7fa25694d3ba (diff) | |
Merge branch 'perfcounters/tracing' into perfcounters/core
Merge reason: this topic is ready now to merge into the main
development branch for .32, with functional
perf trace output.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/power/hibernate_nvs.c')
0 files changed, 0 insertions, 0 deletions