Merge branch 'perf/hw_breakpoints' into perf/core
authorIngo Molnar <mingo@kernel.org>
Wed, 28 Jan 2015 14:48:59 +0000 (15:48 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 28 Jan 2015 14:48:59 +0000 (15:48 +0100)
commitb3890e4704594fa23abe1395d1fafc97d3214be8
tree23e2659713e01779e8854363eb7d1fac49683d32
parent29bf4dbc9841366577ba44175b00c543ad1712d6
parent2a2662bf88e693d477ef08351d03934f7bc0b51c
Merge branch 'perf/hw_breakpoints' into perf/core

The new hw_breakpoint bits are now ready for v3.20, merge them
into the main branch, to avoid conflicts.

Conflicts:
tools/perf/Documentation/perf-record.txt

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/cpufeature.h
arch/x86/include/uapi/asm/msr-index.h
arch/x86/kernel/cpu/amd.c
tools/perf/Documentation/perf-record.txt
tools/perf/tests/parse-events.c
tools/perf/util/parse-events.c
tools/perf/util/parse-events.h