From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Apr 2010 01:37:04 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs... 
X-Git-Tag: v2.6.34-rc4~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d6cf853d4d73c268fc8920ac4e812ee26a12847c;p=~shefty%2Frdma-dev.git

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
---

d6cf853d4d73c268fc8920ac4e812ee26a12847c