| commit | 49302baa640d90074d26297156d180320a7aed2f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 22 13:10:41 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 22 13:10:41 2011 -0700 |
| tree | 5f8bc3cb178b0de73cfec12643078739afecf1e4 | |
| parent | eadc3875ebb724bc749bf604c92c6577d06158d1 [diff] | |
| parent | 46fcb2ed29ff7a9ec34c4ae67b631743eb7e756f [diff] |
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