Merge branch 'for-2637/s3c24xx-all' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git] / mm / shmem.c
diff --cc mm/shmem.c
Simple merge