tree 4fc7f879c32d11d318f411dbe128d080ed8478f9
parent 3e46d21285577a8c9e4c37f9b1002e567c440b28
parent a4b4f11b2783ec678cccb4ce7e4ce9665aa04a24
author Ingo Molnar <mingo@kernel.org> 1399462762 +0200
committer Ingo Molnar <mingo@kernel.org> 1399462762 +0200

Merge branch 'perf/urgent' into perf/core, to avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>