Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Sun, 15 Feb 2009 19:08:55 +0000 (20:08 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 15 Feb 2009 19:08:55 +0000 (20:08 +0100)
commit9abd60304816a5b0fd9e51034f78e3eaed89f901
tree5fb431bbfd133b6e2d19dabd196d87ea5bf281cf
parent5fb896a4e916e72efec4772b66be1cce3d6a9143
parentf9aa28adfc6a4b01268ebb6d88566cca8627905f
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

Conflicts:
kernel/trace/trace_mmiotrace.c