From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Mar 2010 22:38:53 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8cea4eb642890a1de58980e7e1617d1765ef8f7c;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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: Skip check for mandatory locks when unlocking
  GFS2: Allow the number of committed revokes to temporarily be negative
  GFS2: do not select QUOTA
---

8cea4eb642890a1de58980e7e1617d1765ef8f7c