apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Frederic Weisbecker
2009-10-18 01:09:09 +02:00
parent dca2d6ac09 f39cdf25bf
commit 0f8f86c7bd
7303 changed files with 755765 additions and 372694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/Makefile
+2 -2
View File
@@ -1,4 +1,4 @@
# Makefile for Linux samples code
obj-$(CONFIG_SAMPLES) += markers/ kobject/ kprobes/ tracepoints/ \
trace_events/ hw_breakpoint/
obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ tracepoints/ trace_events/ \
hw_breakpoint/