diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 13:20:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 13:20:13 +1100 |
| commit | 7c3a3f52678fffe1acefec234a29f52d006e741b (patch) | |
| tree | d7e501308aded0077995a9369de26e743e7d41ca /Documentation | |
| parent | cb9eb873ed26b05b856d1725a479eaf8b1ef2926 (diff) | |
| parent | f1b98b6a010d6a4ff999f0d83cdfbbf75846a71d (diff) | |
Merge remote-tracking branch 'md/for-next'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/00-INDEX | 4 | ||||
| -rw-r--r-- | Documentation/md/md-cluster.txt (renamed from Documentation/md-cluster.txt) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index c8a8eb1a2b11..793acf999e9e 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX @@ -270,8 +270,8 @@ m68k/ - directory with info about Linux on Motorola 68k architecture. mailbox.txt - How to write drivers for the common mailbox framework (IPC). -md-cluster.txt - - info on shared-device RAID MD cluster. +md/ + - directory with info about Linux Software RAID media/ - info on media drivers: uAPI, kAPI and driver documentation. memory-barriers.txt diff --git a/Documentation/md-cluster.txt b/Documentation/md/md-cluster.txt index 38883276d31c..38883276d31c 100644 --- a/Documentation/md-cluster.txt +++ b/Documentation/md/md-cluster.txt |