]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 25 Jul 2011 17:59:46 +0000 (13:59 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 25 Jul 2011 18:53:52 +0000 (14:53 -0400)
commit8b2270d5abd84b7ad4cb7e70f8e04a3274c924dd
tree3175fb9375aecb50bde1be0bf4fa8aa8155131d6
parent24b49d0a110617411b830a6d42b5f1bd8c2399f4
parent84a981b7ea5c17fd5cba371d870df1fa557bc51d
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>
fs/nfs/nfs4_fs.h
fs/nfs/nfs4proc.c
fs/nfs/nfs4state.c
fs/nfs/pagelist.c
fs/nfs/read.c
fs/nfs/write.c
net/sunrpc/clnt.c