Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2010 19:32:00 +0000 (12:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2010 19:32:00 +0000 (12:32 -0700)
commit26d1e7ced7a51c9ebcff058a9671513fe1fe05b1
treeb9de75e16489b88bd600c51c1df94bacb7a64e48
parentbefd1c7aae617fe6ea3d78f77773d171a8413b15
parent1d6400c7c9cfd38976b25d55b357200ad3ff1be9
Merge branch 'for-linus' of git://git./linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  net/9p: fix memory handling/allocation in rdma_request()