| commit | 1acc9309eb2674533944f48dbaaa53e7750e3947 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 08 23:25:45 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 08 23:25:45 2011 -0700 |
| tree | 255f346c01a33906b612852d5fb008da1f4520da | |
| parent | c2d197e82b6267fd3338f3fbcb12750ca9f5abda [diff] | |
| parent | 149e2d76b4886c4c7ff5e077646a8ba3563c8026 [diff] |
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