tree 4cf804bcf1a3afb90044f8b33405ea6713c8731e
parent 60911731fe7fd4ec4d088fc1a48a56c9fb14103f
parent d9ba7615bfd8bb06f79c853f9dfff9e93a837941
author Linus Torvalds <torvalds@linux-foundation.org> 1240586822 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1240586822 -0700

Merge git://git.kernel.org/pub/scm/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