tree c98f206e8df11f8ecbdd74dba79c29d1f90dea5a
parent ae216dd239765afd592f65d94d8430244cf77ed1
parent 7d6d49b1f5551b87bd59c66c10747b89367760fd
author Ingo Molnar <mingo@elte.hu> 1234342991 +0100
committer Ingo Molnar <mingo@elte.hu> 1234342991 +0100

Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core