Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
Ingo Molnar [Fri, 24 Sep 2010 07:12:05 +0000 (09:12 +0200)]
1  2 
Makefile
arch/Kconfig

diff --cc Makefile
Simple merge
diff --cc arch/Kconfig
Simple merge