Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Feb 2010 16:46:23 +0000 (08:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Feb 2010 16:46:23 +0000 (08:46 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Fix bmap allocation corner-case bug
  GFS2: Fix error code


Trivial merge