]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Jul 2011 06:25:45 +0000 (23:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Jul 2011 06:25:45 +0000 (23:25 -0700)
commit1acc9309eb2674533944f48dbaaa53e7750e3947
tree255f346c01a33906b612852d5fb008da1f4520da
parentc2d197e82b6267fd3338f3fbcb12750ca9f5abda
parent149e2d76b4886c4c7ff5e077646a8ba3563c8026
Merge branch 'for-linus' of git://git./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
fs/btrfs/ctree.h
fs/btrfs/inode.c
fs/btrfs/super.c