merge up to fuse_2_6_merge1
authorMiklos Szeredi <miklos@szeredi.hu>
Fri, 19 Jan 2007 22:11:40 +0000 (22:11 +0000)
committerMiklos Szeredi <miklos@szeredi.hu>
Fri, 19 Jan 2007 22:11:40 +0000 (22:11 +0000)
commit6e7d018049193efe9d092bb91c4416a332f28278
tree1682fdb3dc3d9ca6012e3e4813b6203401ec6d0c
parent7dcdf1bf5b4c9fe36bf6fdf98149154a3216f059
merge up to fuse_2_6_merge1
ChangeLog
kernel/file.c
kernel/fuse_i.h
lib/fuse.c
lib/mount.c
lib/ulockmgr.c
util/fusermount.c
util/ulockmgr_server.c