From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Mar 2011 15:20:39 +0000 (-0700)
Subject: Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: Ubuntu-5.2.0-15.16~21412
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dc87c55120b0a5b0c4d731183f8bb348981aba65;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.39' of git://linux-nfs.org/~bfields/linux:
  SUNRPC: Remove resource leak in svc_rdma_send_error()
  nfsd: wrong index used in inner loop
  nfsd4: fix comment and remove unused nfsd4_file fields
  nfs41: make sure nfs server return right ca_maxresponsesize_cached
  nfsd: fix compile error
  svcrpc: fix bad argument in unix_domain_find
  nfsd4: fix struct file leak
  nfsd4: minor nfs4state.c reshuffling
  svcrpc: fix rare race on unix_domain creation
  nfsd41: modify the members value of nfsd4_op_flags
  nfsd: add proc file listing kernel's gss_krb5 enctypes
  gss:krb5 only include enctype numbers in gm_upcall_enctypes
  NFSD, VFS: Remove dead code in nfsd_rename()
  nfsd: kill unused macro definition
  locks: use assign_type()
---

dc87c55120b0a5b0c4d731183f8bb348981aba65