Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jul 2009 23:48:31 +0000 (16:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jul 2009 23:48:31 +0000 (16:48 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: Fix incorrect parameters to v9fs_file_readn.
  9p: Possible regression in p9_client_stat
  9p: default 9p transport module fix


Trivial merge