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: 0bfc245 d144d5e 437f24f f3f47a6)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 27 Nov 2008 09:56:13 +0000 (10:56 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 27 Nov 2008 09:56:13 +0000 (10:56 +0100)
commit	c7cc77307669336a08928ab8668bdb3f3bcc021b
tree	c9f2997a7266cc5d8c5b61e964d8e014f274f5d3	tree \| snapshot
parent	0bfc24559d7945506184d86739fe365a181f06b7	commit \| diff
parent	d144d5ee6a265823d39f75ecfed351a516295183	commit \| diff
parent	437f24fb897d409a9978eb71ecfaf279dcd94acd	commit \| diff
parent	f3f47a6768a29448866da4422b6f6bee485c947f	commit \| diff

Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/power-tracer' into tracing/core

include/linux/ftrace.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
kernel/trace/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
kernel/trace/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history

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