Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 26 Mar 2007 21:21:55 +0000 (14:21 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 26 Mar 2007 21:21:55 +0000 (14:21 -0700)
commit00db779bfe66b9039a6f34b77fe6184820958362
tree194b6652e6b024943378e4bd7a7b8e3c4cd1df2a
parent9c88b702186d4bb1b28c9bdd5f224f3f8ce2ea51
parentd32b687e2e16e8174e88f186c3bae39a13e57b3d
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: make struct v9fs_cached_file_operations static