From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Sep 2010 02:21:02 +0000 (-0700)
Subject: Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: Ubuntu-5.0.0-8.9~21692
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4f63e3c5be2ab55d47d89ea1d32d2c27254daf26;p=mirror_ubuntu-disco-kernel.git

Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux:
  nfsd4: mask out non-access bits in nfs4_access_to_omode
---

4f63e3c5be2ab55d47d89ea1d32d2c27254daf26