]> Git Repo - linux.git/commitdiff
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <[email protected]>
Wed, 18 Feb 2015 01:00:54 +0000 (17:00 -0800)
committerLinus Torvalds <[email protected]>
Wed, 18 Feb 2015 01:00:54 +0000 (17:00 -0800)
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()


Trivial merge
This page took 0.049737 seconds and 4 git commands to generate.