]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jul 2011 20:10:41 +0000 (13:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jul 2011 20:10:41 +0000 (13:10 -0700)
commit49302baa640d90074d26297156d180320a7aed2f
tree5f8bc3cb178b0de73cfec12643078739afecf1e4
parenteadc3875ebb724bc749bf604c92c6577d06158d1
parent46fcb2ed29ff7a9ec34c4ae67b631743eb7e756f
Merge git://git.kernel.org/pub/scm/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