diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 14:41:14 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 14:41:17 +0200 |
commit | 86665c75da41889f92b774f31ea5a9a436f392a8 (patch) | |
tree | 94b003ab677a64b7d0a6dcca1f636bbbc2a187c9 /scripts | |
parent | 93776a8ec746cf9d32c36e5a5b23d28d8be28826 (diff) | |
parent | 1bbe2a83ab68e5cf8c66c372c7cb3b51910c2cfe (diff) |
Merge branch 'tracing/urgent' into tracing/ftrace
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/tracing/power.pl (renamed from scripts/trace/power.pl) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/scripts/trace/power.pl b/scripts/tracing/power.pl index 4f729b3501e..4f729b3501e 100644 --- a/scripts/trace/power.pl +++ b/scripts/tracing/power.pl |