From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Jul 2011 20:10:41 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
X-Git-Tag: v3.1-rc1~325
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49302baa640d90074d26297156d180320a7aed2f;p=pandora-kernel.git

Merge git://git./linux/kernel/git/steve/gfs2-2.6-nmw

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
  GFS2: combine duplicated block freeing routines
  GFS2: Add S_NOSEC support
  GFS2: Automatically adjust glock min hold time
  GFS2: Cache dir hash table in a contiguous buffer
---

49302baa640d90074d26297156d180320a7aed2f