]> git.baikalelectronics.ru Git - 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)
commitbc1124eb9a0eb9ef17e8dc2292e7a3d8f64b4f6d
tree4eafd59af4fd75e646598e581abb4d41e030fef2
parentdfcce9055372d8e8d5f4f3e31c669e7906a7efd8
parentcbc4e57bff84dbd6bdeb8c091b8bb495d0e96e3a
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