tree c909145638eb5c4897ea7e424759eb9b564ebe18
parent 6a945f38be5f2c198853069a336c887a51d1a238
parent 9f680ce04ea19dabbbafe01b57b61930a9b70741
author Linus Torvalds <torvalds@linux-foundation.org> 1271122624 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271122624 -0700

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: make sure the chunk allocator doesn't create zero length chunks
  Btrfs: fix data enospc check overflow