tree b852a6a5bf9977a33a87158985de02d188ba71d7
parent 734e9a26d612f64e1c9cfd92256969b773954ae2
parent e3e45c01ae690e65f2650e5288b9af802e95a136
author Ingo Molnar <mingo@kernel.org> 1346169955 +0200
committer Ingo Molnar <mingo@kernel.org> 1346169955 +0200

Merge branch 'perf/urgent' into perf/core

Pick up the latest fixes because upcoming uprobes changes will rely on it.

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