From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Feb 2015 01:00:54 +0000 (-0800)
Subject: Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v4.0-rc1~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=533cf7aef25bfe5da72170466582bcd0db5189c0;p=platform%2Fkernel%2Flinux-exynos.git

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

Pull nfsd bugfixes from Bruce Fields:
 "These are fixes for two bugs introduced during the merge window"

* 'for-3.20' of git://linux-nfs.org/~bfields/linux:
  nfsd4: fix v3-less build
  nfsd: fix comparison in fh_fsid_match()
---

533cf7aef25bfe5da72170466582bcd0db5189c0