From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 May 2012 17:05:19 +0000 (-0700)
Subject: Merge tag 'nfs-for-3.4-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v3.4-rc7~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc46f9375a286d05f84a9464efc2b7f1f5614ff4;p=profile%2Fcommon%2Fkernel-common.git

Merge tag 'nfs-for-3.4-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull a NFS client bugfix from Trond Myklebust:
 "Fix for the NFSv4 security negotiation: ensure that the security
  negotiation tries all registered security flavours"

* tag 'nfs-for-3.4-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  auth_gss: the list of pseudoflavors not being parsed correctly
---

bc46f9375a286d05f84a9464efc2b7f1f5614ff4