Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Mar 2009 08:12:42 +0000 (09:12 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Mar 2009 08:12:42 +0000 (09:12 +0100)
Conflicts:
arch/parisc/kernel/irq.c


Trivial merge