pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3e80680 a103e2a)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 6 Jan 2009 09:18:43 +0000 (10:18 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 6 Jan 2009 09:18:43 +0000 (10:18 +0100)
commit	99793e3dbe39a50d871eedc361659a894601e2bf
tree	a676d42a42f4c884e38121e5a5a4d6630929a9f7	tree \| snapshot
parent	3e80680208ba6ce9635ca7c21ad0019442ea166a	commit \| diff
parent	a103e2ab7377dbbef2506be59c49a3f2ae10b60b	commit \| diff

Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent

kernel/trace/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_boot.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_functions_graph.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_hw_branches.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_power.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.