summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-01 08:28:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-01 08:28:53 -0800
commitb930c26416c4ea6855726fd977145ccea9afbdda (patch)
treeae18b550c5918ba36f92d0971cc7f2cc8918a05d /Documentation
parent11d814a20166461358e1cefaf6bcd425698b8460 (diff)
parentf4a8e6563ea5366f563cb741a27fe90c5fa7f0fc (diff)
downloadblackbird-op-linux-b930c26416c4ea6855726fd977145ccea9afbdda.tar.gz
blackbird-op-linux-b930c26416c4ea6855726fd977145ccea9afbdda.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: fix meta data raid-repair merge problem Btrfs: skip allocation attempt from empty cluster Btrfs: skip block groups without enough space for a cluster Btrfs: start search for new cluster at the beginning Btrfs: reset cluster's max_size when creating bitmap Btrfs: initialize new bitmaps' list Btrfs: fix oops when calling statfs on readonly device Btrfs: Don't error on resizing FS to same size Btrfs: fix deadlock on metadata reservation when evicting a inode Fix URL of btrfs-progs git repository in docs btrfs scrub: handle -ENOMEM from init_ipath()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/btrfs.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt
index 64087c34327f..7671352216f1 100644
--- a/Documentation/filesystems/btrfs.txt
+++ b/Documentation/filesystems/btrfs.txt
@@ -63,8 +63,8 @@ IRC network.
Userspace tools for creating and manipulating Btrfs file systems are
available from the git repository at the following location:
- http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs-unstable.git
- git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git
+ http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs.git
+ git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
These include the following tools:
OpenPOWER on IntegriCloud