Merge branch 'core/urgent' into locking/urgent, to collect all pending locking fixes
[pandora-kernel.git] / mm / memory.c
diff --cc mm/memory.c
Simple merge