Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git] / mm / shmem.c
diff --cc mm/shmem.c
Simple merge