From: Linus Torvalds Date: Wed, 23 Dec 2009 21:33:07 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=849254e9bba985e281526b57c02562c7a49a2fcf;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'upstream-linus' of git://git./linux/kernel/git/jlbec/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2: Set i_nlink properly during reflink. ocfs2: Add reflinked file's inode to inode hash eariler. ocfs2: refcounttree.c cleanup. ocfs2: Find proper end cpos for a leaf refcount block. --- 849254e9bba985e281526b57c02562c7a49a2fcf