Merge branch 'tracing/urgent' into tracing/ftrace

This commit is contained in:
Ingo Molnar 2009-04-07 14:41:14 +02:00
commit 86665c75da
12 changed files with 42 additions and 15 deletions

View file

@ -5,6 +5,7 @@
#include <linux/irqflags.h>
#include <linux/utsname.h>
#include <linux/lockdep.h>
#include <linux/ftrace.h>
#include <linux/ipc.h>
#include <linux/pid_namespace.h>
#include <linux/user_namespace.h>
@ -185,6 +186,7 @@ extern struct cred init_cred;
INIT_IDS \
INIT_TRACE_IRQFLAGS \
INIT_LOCKDEP \
INIT_FTRACE_GRAPH \
}