From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Feb 2010 16:46:23 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Tag: v2.6.33-rc8~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b49199c827d81c6dfb8ebb325292aa6b94b45e3d;p=linux.git

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: Fix bmap allocation corner-case bug
  GFS2: Fix error code
---

b49199c827d81c6dfb8ebb325292aa6b94b45e3d