tree 5f60106dacbfe246f52aaaf9bac69dd4749f24a6
parent add79461a2a7d964a00b4a2fdaf313c4cf9cf4ec
parent ce5c1fe9a9e059b5c58f0a7e2a3e687d0efac815
author Ingo Molnar <mingo@kernel.org> 1341515423 +0200
committer Ingo Molnar <mingo@kernel.org> 1341515423 +0200

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>