Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh the tree
authorIngo Molnar <mingo@kernel.org>
Fri, 27 Mar 2015 08:46:03 +0000 (09:46 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 27 Mar 2015 08:46:03 +0000 (09:46 +0100)
commit072e5a1cfabca7276744d24726e094d85721df5c
treec7237fa143f72273aa8a8179f741c24b9072001c
parent294fe0f52a44c6f207211de0686c369a961b5533
parentd525211f9d1be8b523ec7633f080f2116f5ea536
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/events/core.c
tools/perf/util/annotate.c