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)
commit90574ebb7e6e0f7f74636ee87315890ba88d6a4a
tree5f60106dacbfe246f52aaaf9bac69dd4749f24a6
parentadd79461a2a7d964a00b4a2fdaf313c4cf9cf4ec
parentce5c1fe9a9e059b5c58f0a7e2a3e687d0efac815
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