Merge branch 'tracing/ftrace' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 29 Jan 2009 13:27:58 +0000 (14:27 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 29 Jan 2009 13:27:58 +0000 (14:27 +0100)
commitce181ebeff398e7d1a9c6cb92eb035a6d2d07489
tree01cb4853ed1c76c61eed4cc631bf38b3768060aa
parent4a66a82be78e1b6f9f83074423bf42a52251414c
parent890252823766e562301e61340f3187a14033d045
Merge branch 'tracing/ftrace' into tracing/core