Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2009 23:46:48 +0000 (16:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2009 23:46:48 +0000 (16:46 -0700)
commitec6a8679fa8ce977c8b7f86238455b494699de74
treed06401567f67cd757ddf358168bdf574cb4b94f5
parentdb06816cb9ceb21a2bf24122407b7b4fe419c3fc
parentf36f3042eae238bdaefe7c79310afe573bfc3622
Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: be more polite in the async caching threads
  Btrfs: preserve commit_root for async caching
fs/btrfs/ctree.h
fs/btrfs/disk-io.c