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)
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


Trivial merge