Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git] / mm / mremap.c
diff --cc mm/mremap.c
Simple merge