Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorIngo Molnar <mingo@elte.hu>
Thu, 18 Nov 2010 19:07:12 +0000 (20:07 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 18 Nov 2010 19:07:12 +0000 (20:07 +0100)
1  2 
arch/x86/kernel/cpu/perf_event.c
kernel/perf_event.c

Simple merge
Simple merge