]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6f901b 8f34a43)
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)
* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux:
  nfsd4: mask out non-access bits in nfs4_access_to_omode


Trivial merge
Clone of davem's net-next-2.6 tree