]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into tracing/hw-branch-tracing
authorIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 11:34:26 +0000 (13:34 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 11:34:42 +0000 (13:34 +0200)
commit5c02b121d8393d08cbf6d05ad7e30403d58ce68d
tree36165371cf6fd26d674610f1c6bb5fac50e6e13f
parent78d24bd9b738b8dae88647f6b8731713afb629bc
parent46133213a1170df4233f652ebaf2bd25704f505c
Merge branch 'linus' into tracing/hw-branch-tracing

Merge reason: update to latest tracing and ptrace APIs

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig.debug
arch/x86/kernel/Makefile
kernel/trace/trace.h
kernel/trace/trace_selftest.c