Merge commit 'perf/core' into perf/hw-breakpoint

Conflicts:
	kernel/Makefile
	kernel/trace/Makefile
	kernel/trace/trace.h
	samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.

1 files changed, 0 insertions, 6 deletions

diff --git a/samples/Kconfig b/samples/Kconfig
index 17d64ba7864..e4be84ac3d3 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -7,12 +7,6 @@ menuconfig SAMPLES
 
 if SAMPLES
 
-config SAMPLE_MARKERS
-        tristate "Build markers examples -- loadable modules only"
-        depends on MARKERS && m
-        help
-          This build markers example modules.
-
 config SAMPLE_TRACEPOINTS
         tristate "Build tracepoints examples -- loadable modules only"
         depends on TRACEPOINTS && m