| commit | a1922ed661ab2c1637d0b10cde933bd9cd33d965 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Sep 07 08:19:51 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Sep 07 08:19:51 2009 +0200 |
| tree | 0f1777542b385ebefd30b3586d830fd8ed6fda5b | |
| parent | 75e33751ca8bbb72dd6f1a74d2810ddc8cbe4bdf [diff] [blame] | |
| parent | d28daf923ac5e4a0d7cecebae56f3e339189366b [diff] [blame] |
Merge branch 'tracing/core' into tracing/hw-breakpoints
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>
diff --git a/arch/Kconfig b/arch/Kconfig index 1adf2d0..c72f18f 100644 --- a/arch/Kconfig +++ b/arch/Kconfig
@@ -116,3 +116,5 @@ config HAVE_HW_BREAKPOINT bool + +source "kernel/gcov/Kconfig"