Merge commit '9f12600fe425bc28f0ccba034a77783c09c15af4' into for-linus
[pandora-kernel.git] / mm / memory.c
diff --cc mm/memory.c
Simple merge