diff --git a/[refs] b/[refs] index 6a22e0ef2a50..44a0b36c3ecc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f000565adb770b14cebbafde0a4f3e61a3342a63 +refs/heads/master: d39d33c332c611094f84cee39715866f4cbf79e2 diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c index 4ed97a2a115f..0415a83afd66 100644 --- a/trunk/mm/huge_memory.c +++ b/trunk/mm/huge_memory.c @@ -28,6 +28,7 @@ */ unsigned long transparent_hugepage_flags __read_mostly = (1<