]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Sun, 1 May 2011 17:09:39 +0000 (19:09 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 1 May 2011 17:09:39 +0000 (19:09 +0200)
commit77317875d7dfcfe1d66746d871c98300cedb76a0
tree607d673c02117656a956b54dd2bb80fe94edea61
parent7626fae2abd4f3f0b91fa4a651ec0f4cb8036765
parent378392ea5f44b1f42d09739c41fb7bfe676957ac
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_p4.c