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