projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 75e3375 d28daf9)
Merge branch 'tracing/core' into tracing/hw-breakpoints
authorIngo Molnar <mingo@elte.hu>
Mon, 7 Sep 2009 06:19:51 +0000 (08:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 7 Sep 2009 06:19:51 +0000 (08:19 +0200)
commita1922ed661ab2c1637d0b10cde933bd9cd33d965
tree0f1777542b385ebefd30b3586d830fd8ed6fda5btree | snapshot
parent75e33751ca8bbb72dd6f1a74d2810ddc8cbe4bdfcommit | diff
parentd28daf923ac5e4a0d7cecebae56f3e339189366bcommit | diff
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>
arch/Kconfig diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/kernel/Makefile diff1 | diff2 | blob | history
arch/x86/kernel/process.c diff1 | diff2 | blob | history
arch/x86/kernel/ptrace.c diff1 | diff2 | blob | history
arch/x86/kernel/traps.c diff1 | diff2 | blob | history
arch/x86/power/cpu.c diff1 | diff2 | blob | history
kernel/Makefile diff1 | diff2 | blob | history
kernel/trace/Kconfig diff1 | diff2 | blob | history
kernel/trace/trace.h diff1 | diff2 | blob | history
kernel/trace/trace_selftest.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.