]> 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)
commita56a0de53fdc185337f451a61099523daf3d344d
tree607d673c02117656a956b54dd2bb80fe94edea61
parent29fcbce061865bd37c6b63ed2d0e37f8f4e11fb1
parentb4a0c052e3c18ebfa70c72793f6521247b4f1d79
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