From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 May 2009 19:15:35 +0000 (-0700)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Tag: v2.6.30-rc8~51
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=e2a1b9ee2335c35e0e34c88a024481b194b3c9cc

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
---

e2a1b9ee2335c35e0e34c88a024481b194b3c9cc