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)
* '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


Trivial merge