From: Linus Torvalds Date: Fri, 23 Dec 2011 22:58:39 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... X-Git-Tag: v3.2-rc7~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=827fa4c762fa81fbfcd262505588feeeae7a3b66;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: call d_instantiate after all ops are setup Btrfs: fix worker lock misuse in find_worker --- 827fa4c762fa81fbfcd262505588feeeae7a3b66