diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-01 11:28:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-01 11:28:53 -0500 |
| commit | b930c26416c4ea6855726fd977145ccea9afbdda (patch) | |
| tree | ae18b550c5918ba36f92d0971cc7f2cc8918a05d /Documentation | |
| parent | 11d814a20166461358e1cefaf6bcd425698b8460 (diff) | |
| parent | f4a8e6563ea5366f563cb741a27fe90c5fa7f0fc (diff) | |
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.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt index 64087c34327..7671352216f 100644 --- a/Documentation/filesystems/btrfs.txt +++ b/Documentation/filesystems/btrfs.txt | |||
| @@ -63,8 +63,8 @@ IRC network. | |||
| 63 | Userspace tools for creating and manipulating Btrfs file systems are | 63 | Userspace tools for creating and manipulating Btrfs file systems are |
| 64 | available from the git repository at the following location: | 64 | available from the git repository at the following location: |
| 65 | 65 | ||
| 66 | http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs-unstable.git | 66 | http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs.git |
| 67 | git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git | 67 | git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git |
| 68 | 68 | ||
| 69 | These include the following tools: | 69 | These include the following tools: |
| 70 | 70 | ||