Merge branch 'perf/urgent' into perf/core, to pick up fixes before adding more changes
authorIngo Molnar <mingo@kernel.org>
Thu, 20 Aug 2015 09:48:56 +0000 (11:48 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 20 Aug 2015 09:48:56 +0000 (11:48 +0200)
commit40a2ea1bd988e3bbdb07a0708681fdb05cd7d267
tree05806aaa27a4b0516a14a8ccf703c1501500e588
parenta897b5f0393a8a05d230c9248dc5324fb30720a0
parent196676497f2507966f99abef63bede6a8550f8b3
Merge branch 'perf/urgent' into perf/core, to pick up fixes before adding more changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/perf_event.c
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/machine.c