git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[pandora-kernel.git]
/
mm
/
debug.c
diff --git
a/mm/debug.c
b/mm/debug.c
index
3eb3ac2
..
76089dd
100644
(file)
--- a/
mm/debug.c
+++ b/
mm/debug.c
@@
-7,7
+7,7
@@
#include <linux/kernel.h>
#include <linux/mm.h>
-#include <linux/
ftrace_event
.h>
+#include <linux/
trace_events
.h>
#include <linux/memcontrol.h>
static const struct trace_print_flags pageflag_names[] = {