tree d1c3b22b7e9f02fb56927da530da09c6ee7ce0b9
parent a309720c876d7ad2e224bfd1982c92ae4364c82e
parent 45b86a96f17cb2900f291129b0e67287400e45b2
author Ingo Molnar <mingo@elte.hu> 1226392818 +0100
committer Ingo Molnar <mingo@elte.hu> 1226392818 +0100

Merge branch 'tracing/urgent' into tracing/ftrace

Conflicts:
	kernel/trace/trace.c