a1922ed661
Conflicts: arch/Kconfig kernel/trace/trace.h Merge reason: resolve the conflicts, plus adopt to the new ring-buffer APIs. Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
hw_breakpoint | ||
kobject | ||
kprobes | ||
markers | ||
trace_events | ||
tracepoints | ||
Kconfig | ||
Makefile |