]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commit7243f2145a9b06e5cf9a49fc9b8b9a4fff6fb42e
tree50b73e168e0e8b711d5e1ca8878389464d6c905c
parentb478b782e110fdb4135caa3062b6d687e989d994
parent62395efdb0ef42e664ca81677901268c403a6286
parent5bee17f18b595937e6beafeee5197868a3f74a06
Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/core

Conflicts:
arch/parisc/kernel/irq.c
MAINTAINERS
arch/parisc/kernel/irq.c
include/linux/ftrace.h
kernel/trace/trace.h
mm/vmscan.c