| commit | 4f63e3c5be2ab55d47d89ea1d32d2c27254daf26 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 19:21:02 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 07 19:21:02 2010 -0700 |
| tree | 491c6d58ccb246e0b049fa60af4328f649c54089 | |
| parent | e6f901bb85bc0707aaafb3c123c3013c0feaba7d [diff] | |
| parent | 8f34a430ac16d5fbd9d6b383184d35e152f5a963 [diff] |
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