commit | 827fa4c762fa81fbfcd262505588feeeae7a3b66 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 23 14:58:39 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 23 14:58:39 2011 -0800 |
tree | 1dbbfcfb0e3a6e6a453f630bfa008fba6bf78daf | |
parent | 5d219c6b9fa28b990b22e8e3b08a1a1f34400b4f [diff] | |
parent | 08c422c27f855d27b0b3d9fa30ebd938d4ae6f1f [diff] |
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