tree 641d51c6ae677077964d4d9db283a808650269b9
parent 878a4f521bfe83c49694ac990058080fbe090812
parent 95baa25c7321eb8613246acbf61b97911cc748d3
author Linus Torvalds <torvalds@linux-foundation.org> 1243365335 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1243365335 -0700

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