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)
commitae51ce9061b1ddc0fde363913c932bee5b9bc5fd
tree40fd3d633714d2a53fdbd2bdd172fb61232d999a
parent072b198a4ad48bd722ec6d203d65422a4698eae7
parent423478cde453eebdfcfebf4b8d378d8f5d49b853
Merge branch 'perf/core' of git://git./linux/kernel/git/frederic/random-tracing into perf/core
arch/x86/kernel/cpu/perf_event.c
kernel/perf_event.c