projects / linux-flexiantxendom0-3.2.10.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed3ac02 7bdf741)
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)
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


Trivial merge
Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)