]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'nfs-for-3.11-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jul 2013 17:48:24 +0000 (10:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jul 2013 17:48:24 +0000 (10:48 -0700)
Pull NFS client bugfixes from Trond Myklebust:
 - Fix a regression against NFSv4 FreeBSD servers when creating a new
   file
 - Fix another regression in rpc_client_register()

* tag 'nfs-for-3.11-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4: Fix a regression against the FreeBSD server
  SUNRPC: Fix another issue with rpc_client_register()


Trivial merge