summaryrefslogtreecommitdiff
path: root/Documentation/DocBook
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-18 04:00:54 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-18 04:00:54 +0300
commit533cf7aef25bfe5da72170466582bcd0db5189c0 (patch)
tree9378349259efc63391d920bc779787fc7f06a057 /Documentation/DocBook
parent038911597e17017cee55fe93d521164a27056866 (diff)
parenta51f25a587e16bf89dce3f821de99b7717782859 (diff)
downloadlinux-533cf7aef25bfe5da72170466582bcd0db5189c0.tar.xz
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()
Diffstat (limited to 'Documentation/DocBook')
0 files changed, 0 insertions, 0 deletions