From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Sep 2009 22:21:54 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh... 
X-Git-Tag: v3.12-rc1~12828
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7ddbf891b8236b51fb3c9574555eb7d7d13aca6;p=kernel%2Fkernel-generic.git

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: 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.
---

a7ddbf891b8236b51fb3c9574555eb7d7d13aca6