tree 3175fb9375aecb50bde1be0bf4fa8aa8155131d6
parent 34006cee28f7344f9557a4be3816c7891b1bbab1
parent b6844e8f64920cdee620157252169ba63afb0c89
author Stephen Rothwell <sfr@canb.auug.org.au> 1311616786 -0400
committer Trond Myklebust <Trond.Myklebust@netapp.com> 1311620032 -0400

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>