]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Dec 2011 22:58:39 +0000 (14:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Dec 2011 22:58:39 +0000 (14:58 -0800)
commit590e3c100f9331b55fe1bbe97fb6a6ed3f140d77
tree1dbbfcfb0e3a6e6a453f630bfa008fba6bf78daf
parent05131385ffa49ef3694743f1bae15f457742d2ba
parent1a554434cc1992b73627674aecfbd6ed9e4f7419
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
fs/btrfs/inode.c