Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Apr 2011 00:41:06 +0000 (17:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Apr 2011 00:41:06 +0000 (17:41 -0700)
commit18995ba5ab93942a0ddae00e96b94717e9fd9895
tree9620d095073a44dd9dfc17f1d9dfc6d72ed21678
parentf3e96492f6da63eba56f04f3c5cc2af524b5a925
parent1574dff8996ab1ed92c09012f8038b5566fce313
Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.39' of git://linux-nfs.org/~bfields/linux:
  Open with O_CREAT flag set fails to open existing files on non writable directories
  nfsd4: Fix filp leak
  nfsd4: fix struct file leak on delegation