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)
commitb49199c827d81c6dfb8ebb325292aa6b94b45e3d
tree396a9d57746f278c2a4a4ba1d92e79380eb968a7
parent4dfd459b738cf1f65b3eac4e0a9b19bc93cc91c6
parent07ccb7bf2c928fef4fea2cda69ba2e23479578db
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: Fix bmap allocation corner-case bug
  GFS2: Fix error code