Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel...
[pandora-kernel.git] / mm / memory.c
diff --cc mm/memory.c
Simple merge