Frederic Weisbecker 0f8f86c7bd 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.		2009-10-18 01:12:33 +02:00
..
hw_breakpoint	hw-breakpoints: sample HW breakpoint over kernel data address	2009-06-02 22:47:00 +02:00
kobject	samples: mark {static|__init|__exit} for {init|exit} functions	2009-01-06 15:59:12 -08:00
kprobes	sparc64: cheaper asm/uaccess.h inclusion	2009-08-16 18:25:53 -07:00
trace_events	debugfs: Change debuhgfs directory of trace-events-sample.h	2009-09-15 09:50:48 -07:00
tracepoints	const: constify remaining file_operations	2009-10-01 16:11:11 -07:00
Kconfig	Merge commit 'perf/core' into perf/hw-breakpoint	2009-10-18 01:12:33 +02:00
Makefile	Merge commit 'perf/core' into perf/hw-breakpoint	2009-10-18 01:12:33 +02:00