Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Jul 2013 18:21:43 +0000 (11:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Jul 2013 18:21:43 +0000 (11:21 -0700)
commitf315cf5e02d9910b7be893f5b5afdcc2e49d352d
tree5ecd91fab3a4bf35a22700d2aa8ebc1edf3d6059
parentc271f5bc9a7a03fab037dbf5bdd5a730a6e26211
parente4daf1ffbe6cc3b12aab4d604e627829e93e9914
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux

Pull nfsd fix from Bruce Fields:
 "One more nfsd bugfix for 3.11"

* 'for-3.11' of git://linux-nfs.org/~bfields/linux:
  nfsd: nfsd_open: when dentry_open returns an error do not propagate as struct file