OSDN Git Service

Merge branch 'tracing/ftrace' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 4 Jun 2009 11:59:26 +0000 (13:59 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 4 Jun 2009 11:59:40 +0000 (13:59 +0200)
commit64edbc562034f2ec3fce382cb208fab40586d005
tree7fbfaaea9467d14a1a6ac5667ce01be5ccb9b635
parent43bd1236234cacbc18d1476a9b57e7a306efddf5
parent0f6ce3de4ef6ff940308087c49760d068851c1a7
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>