Merge branch 'tracing/ftrace' into tracing/core
commit4387d6d6b8a74722bf1f6fc3e29dd2a84cc1d1c2
authorIngo Molnar <mingo@elte.hu>
Sat, 28 Feb 2009 08:02:49 +0000 (28 09:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 28 Feb 2009 08:02:49 +0000 (28 09:02 +0100)
treeaaaff8ca13625da1823204e1fee29774117f7bc7
parentf701d354075914296474d062f18fc8ee681a2318
parentda74ff0f9b31ed97104c22c278bf2b41bcf8f33c
Merge branch 'tracing/ftrace' into tracing/core