From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Apr 2013 17:26:49 +0000 (-0700)
Subject: Merge tag 'nfs-for-3.9-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: firefly_0821_release~3680^2~757
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=51de01700707167209f92a269ddf85433d29fcb3;p=firefly-linux-kernel-4.4.55.git

Merge tag 'nfs-for-3.9-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

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
---

51de01700707167209f92a269ddf85433d29fcb3