tree 50b73e168e0e8b711d5e1ca8878389464d6c905c
parent b478b782e110fdb4135caa3062b6d687e989d994
parent 62395efdb0ef42e664ca81677901268c403a6286
parent 5bee17f18b595937e6beafeee5197868a3f74a06
author Ingo Molnar <mingo@elte.hu> 1237191162 +0100
committer Ingo Molnar <mingo@elte.hu> 1237191162 +0100

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

Conflicts:
	arch/parisc/kernel/irq.c