Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Thu, 11 Mar 2010 12:39:33 +0000 (13:39 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 11 Mar 2010 12:39:33 +0000 (13:39 +0100)
commit915a0b575fdb2376135ed9334b3ccb1eb51db622
tree12070fc07897e0cd9170aeb351a96923d44d7813
parente02c4fd3142dfb9412531bbfabd510a2a7c6ea46
parent0e95017355dcf43031da6d0e360a748717e56df1
Merge branch 'tip/tracing/core' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
kernel/trace/ftrace.c
kernel/trace/trace.c