Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 May 2009 19:15:35 +0000 (12:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 May 2009 19:15:35 +0000 (12:15 -0700)
commite2a1b9ee2335c35e0e34c88a024481b194b3c9cc
tree641d51c6ae677077964d4d9db283a808650269b9
parent878a4f521bfe83c49694ac990058080fbe090812
parent95baa25c7321eb8613246acbf61b97911cc748d3
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFSv4: Fix the case where NFSv4 renewal fails
  nfs: fix build error in nfsroot with initconst
  XPRTRDMA: fix client rpcrdma FRMR registration on mlx4 devices