From: Linus Torvalds Date: Mon, 16 Jun 2008 20:17:33 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... X-Git-Tag: v2.6.26-rc7~25 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=27eaf66b05687a27aaca0c0b9014c2f5c23bd18c;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 ->hangup() from stack glue operations. ocfs2: Move the call of ocfs2_hb_ctl into the stack glue. ocfs2: Move the hb_ctl_path sysctl into the stack glue. --- 27eaf66b05687a27aaca0c0b9014c2f5c23bd18c