]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 22:21:54 +0000 (15:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 22:21:54 +0000 (15:21 -0700)
commita7ddbf891b8236b51fb3c9574555eb7d7d13aca6
treecb62a2198be1397fedc5a60ba3313a4769fa4e12
parent3e56d49390cd161f34cc049a3661045183d276d5
parentf4edeeb3937d5f9953b5722f1cca9573d5ffe8a0
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.