]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge tag 'nfs-for-3.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jan 2012 16:47:49 +0000 (08:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Jan 2012 16:47:49 +0000 (08:47 -0800)
NFS client bugfixes for Linux 3.3 (pull 3)

* tag 'nfs-for-3.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: Fix machine creds in generic_create_cred and generic_match


Trivial merge