Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Nov 2009 20:23:21 +0000 (12:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Nov 2009 20:23:21 +0000 (12:23 -0800)
commit1836d95928a0f41ada0cbb2a6c4e46b027db9491
tree24ebf7cfd598dfef82247044fb3b65110fe22fc8
parent333a07437c31ea8c16a2b82071629a540ae1e50f
parent3e2796a90cf349527e50b3bc4d0b2f4019b1ce7a
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:
  9p: fix readdir corner cases
  9p: fix readlink
  9p: fix a small bug in readdir for long directories