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 branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
pat.c
diff --git
a/arch/x86/mm/pat.c
b/arch/x86/mm/pat.c
index
501fc60
..
bbe5502
100644
(file)
--- a/
arch/x86/mm/pat.c
+++ b/
arch/x86/mm/pat.c
@@
-12,7
+12,7
@@
#include <linux/debugfs.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/
gfp
.h>
+#include <linux/
slab
.h>
#include <linux/mm.h>
#include <linux/fs.h>
#include <linux/rbtree.h>