tree 1dbbfcfb0e3a6e6a453f630bfa008fba6bf78daf
parent 5d219c6b9fa28b990b22e8e3b08a1a1f34400b4f
parent 08c422c27f855d27b0b3d9fa30ebd938d4ae6f1f
author Linus Torvalds <torvalds@linux-foundation.org> 1324681119 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1324681119 -0800

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