git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	893bbdabf30f2246236ac9308d508c0ae880d80a
tree	23e2659713e01779e8854363eb7d1fac49683d32	tree \| snapshot
parent	c8cc768adfdd3d3889a02683baa996cd1630c056	commit \| diff
parent	55bb4bee9dbe022df7183f07dc42cb6b54c1c42b	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>

Linux Kernel Source Tree.

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