From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=4f63e3c5be2ab55d47d89ea1d32d2c27254daf26;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.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