]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'nfs-for-3.4-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 May 2012 17:05:19 +0000 (10:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 May 2012 17:05:19 +0000 (10:05 -0700)
commitbc46f9375a286d05f84a9464efc2b7f1f5614ff4
tree8d7959826a254bbc51a5ad6d292d5d67d82dbacb
parented3ac021e5038696fd38670e83219cea487f66be
parent7bdf7415a6b8ec31f86b3ad3eaa241257ecb7c4c
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