diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-08 23:25:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-08 23:25:45 -0700 |
| commit | 1acc9309eb2674533944f48dbaaa53e7750e3947 (patch) | |
| tree | 255f346c01a33906b612852d5fb008da1f4520da /tools/perf/scripts/python | |
| parent | MAINTAINERS: update Bjorn Helgaas's email address (diff) | |
| parent | btrfs: fix oops when doing space balance (diff) | |
| download | linux-dev-1acc9309eb2674533944f48dbaaa53e7750e3947.tar.xz linux-dev-1acc9309eb2674533944f48dbaaa53e7750e3947.zip | |
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
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions