Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes
authorIngo Molnar <mingo@kernel.org>
Fri, 18 Sep 2015 07:24:01 +0000 (09:24 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 18 Sep 2015 07:24:01 +0000 (09:24 +0200)
commit02386c356af0ce5bbee11ed9b23c312ca60298f0
tree24d6816d783975cbc237af3a53c34f44fda03de2
parentd71b0ad8d30922ccdd0705318237e6890b4ec1b6
parentf73e22ab450140830005581c2c7ec389791a1b8d
Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/perf_event.h
arch/x86/kernel/tsc.c
kernel/events/core.c
tools/perf/config/Makefile
tools/perf/util/util.c