commit | e2a1b9ee2335c35e0e34c88a024481b194b3c9cc | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 26 12:15:35 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 26 12:15:35 2009 -0700 |
tree | 641d51c6ae677077964d4d9db283a808650269b9 | |
parent | 878a4f521bfe83c49694ac990058080fbe090812 [diff] | |
parent | 95baa25c7321eb8613246acbf61b97911cc748d3 [diff] |
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