| commit | 533cf7aef25bfe5da72170466582bcd0db5189c0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 17 17:00:54 2015 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 17 17:00:54 2015 -0800 |
| tree | 9378349259efc63391d920bc779787fc7f06a057 | |
| parent | 038911597e17017cee55fe93d521164a27056866 [diff] | |
| parent | a51f25a587e16bf89dce3f821de99b7717782859 [diff] |
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()