| commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c | [log] [tgz] |
|---|---|---|
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | Mon Jul 16 12:01:42 2012 -0400 |
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | Mon Jul 16 12:01:42 2012 -0400 |
| tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d | |
| parent | a8d8f02cf0c379693762107afe812b9e52090e39 [diff] | |
| parent | 9249e17fe094d853d1ef7475dd559a2cc7e23d42 [diff] |
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6 Resolve conflicts with the VFS atomic open and sget changes. Conflicts: fs/nfs/nfs4proc.c