Merge branch 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Mon, 13 Apr 2009 22:02:16 +0000 (00:02 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 13 Apr 2009 22:02:22 +0000 (00:02 +0200)
commitb5c851a88a369854c04e511cefb84ea2d0cfa209
tree55084d3d51708f90f27d0a70db5ab63916942f14
parenteb02ce017dd83985041a7e54c6449f92d53b026f
parent80a04d3f2f94fb68b5df05e3ac6697130bc3467a
Merge branch 'linus' into tracing/core

Merge reason: merge latest tracing fixes to avoid conflicts in
              kernel/trace/trace_events_filter.c with upcoming change

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/Kconfig
kernel/trace/trace_events.c
kernel/trace/trace_events_filter.c
kernel/trace/trace_events_stage_2.h