Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
commit12bac708e6242b0ccd969519582b2938d78289bb
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2009 15:27:02 +0000 (24 08:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2009 15:27:02 +0000 (24 08:27 -0700)
tree4cf804bcf1a3afb90044f8b33405ea6713c8731e
parent60911731fe7fd4ec4d088fc1a48a56c9fb14103f
parentd9ba7615bfd8bb06f79c853f9dfff9e93a837941
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