]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'nfs-for-3.9-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Apr 2013 17:26:49 +0000 (10:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Apr 2013 17:26:49 +0000 (10:26 -0700)
Pull another nfs fixlet from Trond Myklebust:
 "I suddenly noticed that a one-line issue that I _thought_ I had fixed
  with the nfs41_walk_client_list patch was apparently still there in
  the pull request I sent earlier today.  I'm very sorry for not
  catching that in time.

   - Fix a brain fart in nfs41_walk_client_list"

* tag 'nfs-for-3.9-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4: Doh! Typo in the fix to nfs41_walk_client_list


Trivial merge