summaryrefslogtreecommitdiff
path: root/Documentation/block/00-INDEX
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-10-15 09:05:06 +0400
committerIngo Molnar <mingo@kernel.org>2013-10-15 09:05:18 +0400
commit426ee9e3bbc478ed9c0a079a4270f6095f0eb975 (patch)
treed8f295e2e516a61b2ab8ccb49f5b1d9fb67979bd /Documentation/block/00-INDEX
parentb7af41a1bc255c0098c37a4bcf5c7e5e168ce875 (diff)
parent61e6cfa80de5760bbe406f4e815b7739205754d2 (diff)
downloadlinux-426ee9e3bbc478ed9c0a079a4270f6095f0eb975.tar.xz
Merge tag 'v3.12-rc5' into perf/core
Merge Linux v3.12-rc5, to pick up the latest fixes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/block/00-INDEX')
-rw-r--r--Documentation/block/00-INDEX2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/block/00-INDEX b/Documentation/block/00-INDEX
index d18ecd827c40..929d9904f74b 100644
--- a/Documentation/block/00-INDEX
+++ b/Documentation/block/00-INDEX
@@ -6,6 +6,8 @@ capability.txt
- Generic Block Device Capability (/sys/block/<device>/capability)
cfq-iosched.txt
- CFQ IO scheduler tunables
+cmdline-partition.txt
+ - how to specify block device partitions on kernel command line
data-integrity.txt
- Block data integrity
deadline-iosched.txt