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.
# Makefile for Linux samples code obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ tracepoints/ trace_events/ \ hw_breakpoint/
