| commit | 5f00bcb38ef9a980a33c6dbdc0044964b05f22dd | |
| author | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Mon, 25 Jul 2011 17:59:46 +0000 (25 13:59 -0400) | ||
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | |
| Mon, 25 Jul 2011 18:53:52 +0000 (25 14:53 -0400) | ||
| tree | 3175fb9375aecb50bde1be0bf4fa8aa8155131d6 | treesnapshot (tar.gz zip) |
| parent | 34006cee28f7344f9557a4be3816c7891b1bbab1 | commitdiff |
| parent | b6844e8f64920cdee620157252169ba63afb0c89 | commitdiff |
Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
vfs/nfs: fixup for nfs_open_context change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
vfs/nfs: fixup for nfs_open_context change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>