From: Linus Torvalds <torvalds@linux-foundation.org>
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-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=827fa4c762fa81fbfcd262505588feeeae7a3b66;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./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