From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Jun 2010 16:04:02 +0000 (-0700)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Tag: v2.6.35-rc4~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7865c234fff2db474f21a62b2f906a70317c972;p=platform%2Fkernel%2Flinux-3.10.git

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

e7865c234fff2db474f21a62b2f906a70317c972