Merge tag '9p-3.10-bug-fix-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Jun 2013 00:35:25 +0000 (17:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Jun 2013 00:35:25 +0000 (17:35 -0700)
commit1b79821fe7855c34030bc2f177660874e0a0ab62
tree0421a6958fabad4a7b25f9bfc6232ed332f1a2c6
parentab0296319a8cb970f4e42659472bb40fbfae3e56
parent6390460af8a672754dd6743f326515e98f52b2a7
Merge tag '9p-3.10-bug-fix-1' of git://git./linux/kernel/git/ericvh/v9fs

Pull net/9p bug fix from Eric Van Hensbergen:
 "zero copy error fix"

* tag '9p-3.10-bug-fix-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  net/9p: Handle error in zero copy request correctly for 9p2000.u