Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[pandora-kernel.git] / fs / splice.c
diff --cc fs/splice.c
Simple merge