]> bbs.cooldavid.org Git - net-next-2.6.git/commit
Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:05:55 +0000 (14:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:05:55 +0000 (14:05 -0700)
commit2547d1d20f3a252567f974de8ce1c572a0815d5a
tree786404cb38c6ca55ca46a63df570c119ca32561e
parent7be0d4f90ad8e0f9591fd311765a212a42e26b13
parentf6360efb83cd6dd1476cd758834c8277508c1f15
Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux:
  nfsd: fix NULL dereference in nfsd_statfs()
  nfsd4: fix downgrade/lock logic
  nfsd4: typo fix in find_any_file
  nfsd4: bad BUG() in preprocess_stateid_op