switch fuse
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 18 Dec 2010 16:15:22 +0000 (11:15 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 13 Jan 2011 01:02:44 +0000 (20:02 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/fuse/dir.c
fs/fuse/inode.c

diff --cc fs/fuse/dir.c
Simple merge
diff --cc fs/fuse/inode.c
Simple merge