git.maquefel.me Git - linux.git/commit

author	Ingo Molnar <mingo@elte.hu>
	Mon, 13 Apr 2009 22:02:16 +0000 (00:02 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 13 Apr 2009 22:02:22 +0000 (00:02 +0200)
commit	b5c851a88a369854c04e511cefb84ea2d0cfa209
tree	55084d3d51708f90f27d0a70db5ab63916942f14	tree \| snapshot
parent	eb02ce017dd83985041a7e54c6449f92d53b026f	commit \| diff
parent	80a04d3f2f94fb68b5df05e3ac6697130bc3467a	commit \| diff

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>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

kernel/trace/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_events.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_events_filter.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_events_stage_2.h	diff1 \|	diff2 \|	blob \| history