From: Steven Rostedt on

Ingo,

Please pull the latest tip/tracing/core tree, which can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/core


Li Zefan (1):
tracing: Make the documentation clear on trace_event boot option

Steven Rostedt (1):
tracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header

Thiago Farina (1):
tracing: Fix "integer as NULL pointer" warning.

----
Documentation/trace/events.txt | 3 +-
include/linux/tracepoint.h | 114 +++++++++++++++++++++-------------------
include/trace/define_trace.h | 5 ++
include/trace/events/napi.h | 10 +++-
kernel/trace/trace_output.c | 2 +-
5 files changed, 75 insertions(+), 59 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/