Merge tag 'fbdev-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj...
[pandora-kernel.git] / mm / shmem.c
diff --cc mm/shmem.c
Simple merge