git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 78d24bd 4613321)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 7 Apr 2009 11:34:26 +0000 (13:34 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 7 Apr 2009 11:34:42 +0000 (13:34 +0200)
commit	5c02b121d8393d08cbf6d05ad7e30403d58ce68d
tree	36165371cf6fd26d674610f1c6bb5fac50e6e13f	tree \| snapshot
parent	78d24bd9b738b8dae88647f6b8731713afb629bc	commit \| diff
parent	46133213a1170df4233f652ebaf2bd25704f505c	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_selftest.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.