9467d14a1a6ac5667ce01be5ccb9b635
parent 43bd1236234cacbc18d1476a9b57e7a306efddf5
parent 0f6ce3de4ef6ff940308087c49760d068851c1a7
author Ingo Molnar <mingo@elte.hu> 1244116766 +0200
committer Ingo Molnar <mingo@elte.hu> 1244116780 +0200

Merge branch 'tracing/ftrace' into tracing/core

Merge reason: this mini-topic had outstanding problems that delayed
              its merge, so it does not fast-forward.

Signed-off-by: Ingo Molnar <mingo@elte.hu>