]> git.baikalelectronics.ru Git - 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)
commit44c788f3c43bc7d68b3b888c1dd1dce92f4fa905
tree5f8bc3cb178b0de73cfec12643078739afecf1e4
parentb15599d3682ccc6dd44386faca6b8419b6439ffe
parent3476e7444968099a3f17522bf143f9aa9c7319e7
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