From: Linus Torvalds Date: Tue, 1 Mar 2011 01:52:47 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=158a5d61f780b707da0b559cf60d72294006aa97;p=linux-beck.git Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Check heartbeat mode for kernel stacks only Ocfs2/refcounttree: Fix a bug for refcounttree to writeback clusters in a right number. ocfs2: Fix estimate of necessary credits for mkdir --- 158a5d61f780b707da0b559cf60d72294006aa97