From: Linus Torvalds Date: Mon, 10 Apr 2006 23:44:09 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 X-Git-Tag: v2.6.17-rc2~285 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e38d557896c4213dd0919770feac0f4a8f60151b;p=linux-2.6-omap-h63xx.git 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 --- e38d557896c4213dd0919770feac0f4a8f60151b