From: Linus Torvalds Date: Fri, 22 Sep 2006 19:52:16 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... X-Git-Tag: v2.6.19-rc1~1296 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: ocfs2: Remove overzealous BUG_ON() ocfs2: Don't print on unknown remote blocking call ocfs2: Remove EXPERIMENTAL dependency ocfs2: implement directory read-ahead ocfs2: properly update i_mtime on buffered write ocfs2: Fix directory link count checks in ocfs2_link() ocfs2: move nlink check in ocfs2_mknod() ocfs2: Fix heartbeat sector calculation [PATCH] fs/ocfs2/ioctl.c should #include "ioctl.h" ocfs2: add ext2 attributes configfs: Prevent duplicate subsystem names. --- 3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e