Merge branch 'for-3.13' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Dec 2013 23:24:32 +0000 (15:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Dec 2013 23:24:32 +0000 (15:24 -0800)
commitc9111b4df407e6b73f2a92c36f7fc93a7b27fd99
tree1a5445e1efa58ac914ada74be50ee8ad9593b69f
parent2208f6513accb06ccb0f7b6f9e97989cd865585a
parent781c2a5a5f75eacc04663aced0f0f1a648d4f308
Merge branch 'for-3.13' of git://linux-nfs.org/~bfields/linux

Pull nfsd reply cache bugfix from Bruce Fields:
 "One bugfix for nfsd crashes"

* 'for-3.13' of git://linux-nfs.org/~bfields/linux:
  nfsd: when reusing an existing repcache entry, unhash it first