diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-10 16:44:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-10 16:44:09 -0700 |
| commit | e38d557896c4213dd0919770feac0f4a8f60151b (patch) | |
| tree | 6f35cc88a0591a2195ce3e4a849d34c367288903 /fs/jfs/acl.c | |
| parent | de12a7878c11f3b282d640888aa635e0711d0b5e (diff) | |
| parent | 65714b918415e06c92426f6544b2296dae694590 (diff) | |
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
* 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2:
[PATCH] CONFIGFS_FS must depend on SYSFS
[PATCH] Bogus NULL pointer check in fs/configfs/dir.c
ocfs2: Better I/O error handling in heartbeat
ocfs2: test and set teardown flag early in user_dlm_destroy_lock()
ocfs2: Handle the DLM_CANCELGRANT case in user_unlock_ast()
ocfs2: catch an invalid ast case in dlmfs
ocfs2: remove an overly aggressive BUG() in dlmfs
ocfs2: multi node truncate fix
Diffstat (limited to 'fs/jfs/acl.c')
0 files changed, 0 insertions, 0 deletions