diff options
author | 2011-07-22 13:10:41 -0700 | |
---|---|---|
committer | 2011-07-22 13:10:41 -0700 | |
commit | 49302baa640d90074d26297156d180320a7aed2f (patch) | |
tree | 5f8bc3cb178b0de73cfec12643078739afecf1e4 /kernel/workqueue.c | |
parent | Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 (diff) | |
parent | GFS2: combine duplicated block freeing routines (diff) | |
download | linux-rng-49302baa640d90074d26297156d180320a7aed2f.tar.xz linux-rng-49302baa640d90074d26297156d180320a7aed2f.zip |
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
Diffstat (limited to 'kernel/workqueue.c')
0 files changed, 0 insertions, 0 deletions