diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-09-20 12:00:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-09-20 12:01:01 +0200 |
| commit | 40a0c68ca9b49fb3e7292c1bae035ba5bcb27903 (patch) | |
| tree | 11682834d3442d4640c4464709a76a268869ffbd /Documentation/filesystems/btrfs.txt | |
| parent | c61037e905a5cb74c7d786c35ee2cdbab9ed63af (diff) | |
| parent | 7e3115ef5149fc502e3a2e80719dba54a8e7409d (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge in the latest fixes before applying a dependent patch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/filesystems/btrfs.txt')
| -rw-r--r-- | Documentation/filesystems/btrfs.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt index b349d57b76e..9dae5940743 100644 --- a/Documentation/filesystems/btrfs.txt +++ b/Documentation/filesystems/btrfs.txt @@ -87,7 +87,7 @@ Unless otherwise specified, all options default to off. device=<devicepath> Specify a device during mount so that ioctls on the control device - can be avoided. Especialy useful when trying to mount a multi-device + can be avoided. Especially useful when trying to mount a multi-device setup as root. May be specified multiple times for multiple devices. discard |