Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Wed, 14 Apr 2010 10:15:23 +0000 (12:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 14 Apr 2010 10:15:23 +0000 (12:15 +0200)
commitb15c7b1cee119999e9eafcd602d24a595e77adac
tree48765b70c65e80d62f0ce11a3245b4ef2299b060
parentc1ab9cab75098924fa8226a8a371de66977439df
parentaa27497c2fb4c7f57706099bd489e683e5cc3e3b
Merge branch 'tip/tracing/core' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
kernel/trace/trace.c