git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

author	Ingo Molnar <mingo@kernel.org>
	Wed, 28 Jan 2015 14:48:59 +0000 (15:48 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Wed, 28 Jan 2015 14:48:59 +0000 (15:48 +0100)
commit	b3890e4704594fa23abe1395d1fafc97d3214be8
tree	23e2659713e01779e8854363eb7d1fac49683d32	tree \| snapshot (tar.gz zip)
parent	29bf4dbc9841366577ba44175b00c543ad1712d6	commit \| diff
parent	2a2662bf88e693d477ef08351d03934f7bc0b51c	commit \| diff

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>

Motorola kernel-slsi

RSS Atom

arch/x86/include/asm/cpufeature.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/uapi/asm/msr-index.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/amd.c	diff1 \|	diff2 \|	blob \| history
tools/perf/Documentation/perf-record.txt	diff1 \|	diff2 \|	blob \| history
tools/perf/tests/parse-events.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/parse-events.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/parse-events.h	diff1 \|	diff2 \|	blob \| history