Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@kernel.org>
Sat, 8 Dec 2012 14:25:06 +0000 (15:25 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 8 Dec 2012 14:25:06 +0000 (15:25 +0100)
commitf0b9abfb044649bc452fb2fb975ff2fd599cc6a3
tree7800081c5cb16a4dfee1e57a70f3be90f7b50d9a
parentadc1ef1e37358d3c17d1a74a58b2e104fc0bda15
parent1b3c393cd43f22ead8a6a2f839efc6df8ebd7465
Merge branch 'linus' into perf/core

Conflicts:
tools/perf/Makefile
tools/perf/builtin-test.c
tools/perf/perf.h
tools/perf/tests/parse-events.c
tools/perf/util/evsel.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
14 files changed:
arch/x86/kernel/cpu/perf_event_p6.c
include/linux/kernel.h
tools/perf/Makefile
tools/perf/builtin-kvm.c
tools/perf/perf.h
tools/perf/tests/parse-events.c
tools/perf/util/evsel.c
tools/perf/util/evsel.h
tools/perf/util/header.c
tools/perf/util/header.h
tools/perf/util/parse-events.c
tools/perf/util/parse-events.h
tools/perf/util/pmu.h
tools/perf/util/session.h