Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 07:32:40 +0000 (09:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 21 Jul 2011 07:32:40 +0000 (09:32 +0200)
commit40bcea7bbe8fe452a2d272e2ffd3dea281eec9ff
treeaedb6d02e53e3cf84cc32fd81db84032cee205e1
parent492f73a303b488ffd67097b2351d54aa6e6c7c73
parent14a8fd7ceea6915c613746203d6e9a2bf273f16c
Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core
kernel/trace/ftrace.c
kernel/trace/trace.h