Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
Ingo Molnar [Sat, 8 Dec 2012 14:54:35 +0000 (15:54 +0100)]
Pull ftrace updates from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1  2 
arch/unicore32/include/asm/Kbuild

Simple merge