Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2010 02:21:02 +0000 (19:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2010 02:21:02 +0000 (19:21 -0700)
commit4f63e3c5be2ab55d47d89ea1d32d2c27254daf26
tree491c6d58ccb246e0b049fa60af4328f649c54089
parente6f901bb85bc0707aaafb3c123c3013c0feaba7d
parent8f34a430ac16d5fbd9d6b383184d35e152f5a963
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