Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Feb 2015 01:00:54 +0000 (17:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Feb 2015 01:00:54 +0000 (17:00 -0800)
commit533cf7aef25bfe5da72170466582bcd0db5189c0
tree9378349259efc63391d920bc779787fc7f06a057
parent038911597e17017cee55fe93d521164a27056866
parenta51f25a587e16bf89dce3f821de99b7717782859
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()