tree 41ca2f1552864cc86bd5735c1b05d0de2898bb05
parent c19c6c32dcccfc89216bd579c0cb12d2dd45098f
parent 546888da82082555a56528730a83f0afd12f33bf
author Linus Torvalds <torvalds@linux-foundation.org> 1240348378 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1240348378 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: fix btrfs fallocate oops and deadlock
  Btrfs: use the right node in reada_for_balance
  Btrfs: fix oops on page->mapping->host during writepage
  Btrfs: add a priority queue to the async thread helpers
  Btrfs: use WRITE_SYNC for synchronous writes