| commit | e7865c234fff2db474f21a62b2f906a70317c972 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 27 09:04:02 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 27 09:04:02 2010 -0700 |
| tree | da15a1c215b69dda6279c61106e2a5981e7e1d72 | |
| parent | bf2937695fe2330bfd8933a2310e7bdd2581dc2e [diff] | |
| parent | d3f6baaa34c54040b3ef30950e59b54ac0624b21 [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 an embarassing typo in encode_attrs() NFSv4: Ensure that /proc/self/mountinfo displays the minor version number NFSv4.1: Ensure that we initialise the session when following a referral SUNRPC: Fix a re-entrancy bug in xs_tcp_read_calldir() nfs4 use mandatory attribute file type in nfs4_get_root