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: b478b78 62395ef 5bee17f)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 16 Mar 2009 08:12:42 +0000 (09:12 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 16 Mar 2009 08:12:42 +0000 (09:12 +0100)
commit	7243f2145a9b06e5cf9a49fc9b8b9a4fff6fb42e
tree	50b73e168e0e8b711d5e1ca8878389464d6c905c	tree \| snapshot
parent	b478b782e110fdb4135caa3062b6d687e989d994	commit \| diff
parent	62395efdb0ef42e664ca81677901268c403a6286	commit \| diff
parent	5bee17f18b595937e6beafeee5197868a3f74a06	commit \| diff

Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/core

Conflicts:
arch/parisc/kernel/irq.c

MAINTAINERS	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/parisc/kernel/irq.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/linux/ftrace.h	diff1 \|	diff2 \|	diff3 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	diff3 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	diff3 \|	blob \| history

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