git.samba.org
/
sfrench
/
cifs-2.6.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/sfrench/cifs-2.6
[sfrench/cifs-2.6.git]
/
mm
/
memory.c
diff --git
a/mm/memory.c
b/mm/memory.c
index 3a6c4a6583256584303c4ac7c8813938abc49ed0..164951c473058a25c081d5e47260d872068cdbb7 100644
(file)
--- a/
mm/memory.c
+++ b/
mm/memory.c
@@
-64,8
+64,6
@@
#include "internal.h"
-#include "internal.h"
-
#ifndef CONFIG_NEED_MULTIPLE_NODES
/* use the per-pgdat data instead for discontigmem - mbligh */
unsigned long max_mapnr;