From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Apr 2009 15:27:02 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=12bac708e6242b0ccd969519582b2938d78289bb;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.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: Ensure that the inode goal block settings are updated
  GFS2: Fix bug in block allocation
  bitops: Add __ffs64 bitop
---

12bac708e6242b0ccd969519582b2938d78289bb