From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Jan 2010 17:48:29 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=79ecb043ea0ae046463f03dea46c5e13a9312205;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Use MAX_LFS_FILESIZE for meta inode size
  GFS2: Fix gfs2_xattr_acl_chmod()
  GFS2: Fix locking bug in rename
  GFS2: Ensure uptodate inode size when using O_APPEND
---

79ecb043ea0ae046463f03dea46c5e13a9312205