Merge branch 'tracing/ftrace' into tracing/function-return-tracer
authorIngo Molnar <mingo@elte.hu>
Sun, 16 Nov 2008 06:57:13 +0000 (07:57 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 16 Nov 2008 06:57:13 +0000 (07:57 +0100)
commit985809608f758a8d3ddda4ce5a53ed0e57fb9e1b
tree063fe72ed9bb3410c3293c83a7882cecc46e7410
parentc91add5fa68ea9b1f2923b3788c5dae0e60e1f6b
parent1c80025a49855b12fa09bb6db71820e3367b1369
Merge branch 'tracing/ftrace' into tracing/function-return-tracer