]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Mar 2011 22:52:09 +0000 (14:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Mar 2011 22:52:09 +0000 (14:52 -0800)
commit3979491701cfb2aa7477f5baf40553355391418b
tree4eafd59af4fd75e646598e581abb4d41e030fef2
parent6b684cd5799cd1e691024ca3a688d1cdec9d4824
parent3ec07aa9522e3d5e9d5ede7bef946756e623a0a0
Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux:
  nfsd: wrong index used in inner loop
  nfsd4: fix bad pointer on failure to find delegation
  NFSD: fix decode_cb_sequence4resok