From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Apr 2011 00:41:06 +0000 (-0700)
Subject: Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=18995ba5ab93942a0ddae00e96b94717e9fd9895;p=openwrt%2Fstaging%2Fblogic.git

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
---

18995ba5ab93942a0ddae00e96b94717e9fd9895