tree cb62a2198be1397fedc5a60ba3313a4769fa4e12
parent 3e56d49390cd161f34cc049a3661045183d276d5
parent f4edeeb3937d5f9953b5722f1cca9573d5ffe8a0
author Linus Torvalds <torvalds@linux-foundation.org> 1253744514 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253744514 -0700

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: Update documentation to add fscache related bits
  9p: Add fscache support to 9p
  9p: Fix the incorrect update of inode size in v9fs_file_write()
  9p: Use the i_size_[read, write]() macros instead of using inode->i_size directly.