diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-14 13:00:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-14 13:00:29 -0400 |
| commit | 28e8351ac22de25034e048c680014ad824323c65 (patch) | |
| tree | fd4d137e9b761674096817943beec1936a4f702b /fs/proc/array.c | |
| parent | 3b993e8bee32d6dfe04df560eda8e1aff6248a22 (diff) | |
| parent | d18c4d687dd4625360ee14047d7eb454217719ee (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
[GFS2] Revert remounting w/o acl option leaves acls enabled
[GFS2] Fix setting of inherit jdata attr
[GFS2] Fix incorrect error path in prepare_write()
[GFS2] Fix incorrect return code in rgrp.c
[GFS2] soft lockup in rgblk_search
[GFS2] soft lockup detected in databuf_lo_before_commit
[DLM] fix basts for granted PR waiting CW
[DLM] More othercon fixes
[DLM] Fix memory leak in dlm_add_member() when dlm_node_weight() returns less than zero
[DLM] zero unused parts of sockaddr_storage
[DLM] fix NULL ls usage
[DLM] Clear othercon pointers when a connection is closed
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions