24ebf7cfd598dfef82247044fb3b65110fe22fc8
parent 333a07437c31ea8c16a2b82071629a540ae1e50f
parent 3e2796a90cf349527e50b3bc4d0b2f4019b1ce7a
author Linus Torvalds <torvalds@linux-foundation.org> 1257193401 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1257193401 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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