Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git] / mm / truncate.c
diff --cc mm/truncate.c
Simple merge