From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Jul 2011 06:25:45 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs... 
X-Git-Tag: v3.0-rc7~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1acc9309eb2674533944f48dbaaa53e7750e3947;p=~emulex%2Finfiniband.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  btrfs: fix oops when doing space balance
  Btrfs: don't panic if we get an error while balancing V2
  btrfs: add missing options displayed in mount output
---

1acc9309eb2674533944f48dbaaa53e7750e3947