]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitbf000395521eb1bea281956f576b17c14a33e1f4
tree9378349259efc63391d920bc779787fc7f06a057
parentd3c8d6c53fe6a337fdd97be14e9a3bd3ea51e07e
parent6a32d20b5d7079d665076b95dac2ca309a76c177
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()