Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core

[~andy/linux] / include / trace / trace_events.h

/* trace/<type>.h here */

#include <trace/sched.h>
#include <trace/irq.h>