Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Sun, 8 Jan 2012 11:31:24 +0000 (12:31 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 8 Jan 2012 11:31:24 +0000 (12:31 +0100)
commit636f0c70f2557e0819b50c74e31b4a027327015e
tree3a259ef26659dac92782651440091b9f5ab1a7f7
parent675eef66e3edcab8065533edfefbcbbacb9a30d3
parent2e885057b7f75035f0b85e02f737891482815a81
Merge branch 'tip/perf/urgent' of git://git./linux/kernel/git/rostedt/linux-trace into perf/core
arch/s390/oprofile/init.c
arch/x86/kernel/cpu/perf_event_intel.c
kernel/events/core.c