]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Thu, 5 Jul 2012 19:10:23 +0000 (21:10 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 5 Jul 2012 19:10:23 +0000 (21:10 +0200)
commiteec25d0e7934762e7ab3aef785c8f9c8bf5f214e
tree5f60106dacbfe246f52aaaf9bac69dd4749f24a6
parente32ec42576c584eef87b61319889d967fc395fae
parent3cc1eb2dd5493d1463a7f169d2edda85405ee242
Merge branch 'perf/urgent' into perf/core

Merge this branch to pick up a fixlet and to update to a more recent base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/perf_event.c