git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	60b2beb5c0b6851bfd30a48d4c318618ccc9a2da
tree	55084d3d51708f90f27d0a70db5ab63916942f14	tree \| snapshot
parent	9443574e641a6b6970311f98684cf96aed950411	commit \| diff
parent	cc354de247fe284673c66c935aec1325a8695829	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>

Linux Kernel Source Tree.

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