Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Fri, 26 Feb 2010 08:20:17 +0000 (09:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 26 Feb 2010 08:20:17 +0000 (09:20 +0100)
commit281b3714e91162b66add1cfac404cf7b81e3e2f2
tree9f80453153db272c207129d971e17d31a6bb214a
parent64b9fb5704a479d98a59f2a1d45d3331a8f847f8
parent7b60997f73865b019e595720185c85285ca3df9a
Merge branch 'tip/tracing/core' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
kernel/trace/Kconfig
kernel/trace/trace_kprobe.c