]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3296ad5 bd4df02)
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)
commit1576f03d0225877d31d477344ca81a87b11e6e46
tree9378349259efc63391d920bc779787fc7f06a057tree | snapshot
parent3296ad5d3cc0458041236fae89bc5910e7c2847bcommit | diff
parentbd4df02de7fe9ef822a8cc12fcd39e72d040875ccommit | 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()
Linux Kernel Source Tree.