tree e0242d5077730dabc4102b7abad9ee0c41e33bc0
parent fb385003c4ac9634cf2448f6ded81e5fd1190c1f
parent ceab36edd3d3ad3ffd01d41d6d1e05ac1ff8357e
author Linus Torvalds <torvalds@linux-foundation.org> 1249696989 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1249696989 -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 balancing oops when invalidate_inode_pages2 returns EBUSY
  Btrfs: correct error-handling zlib error handling
  Btrfs: remove superfluous NULL pointer check in btrfs_rename()
  Btrfs: make sure the async caching thread advances the key
  Btrfs: fix btrfs_remove_from_free_space corner case