diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 20:48:02 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 20:48:02 +0100 |
| commit | 68c404b18f6fba404b2753622d0459c68ee128ae (patch) | |
| tree | c1ec0bb12f19d91071b461cc2831d9d3dd4c74f3 /fs/nfs/inode.c | |
| parent | NFSv4: Ensure continued open and lockowner name uniqueness (diff) | |
| parent | NFS: Don't use vm_map_ram() in readdir (diff) | |
| download | linux-68c404b18f6fba404b2753622d0459c68ee128ae.tar.xz linux-68c404b18f6fba404b2753622d0459c68ee128ae.zip | |
Merge branch 'bugfixes' into nfs-for-2.6.38
Conflicts:
fs/nfs/nfs2xdr.c
fs/nfs/nfs3xdr.c
fs/nfs/nfs4xdr.c
Diffstat (limited to 'fs/nfs/inode.c')
0 files changed, 0 insertions, 0 deletions