diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /Documentation/ABI/testing/procfs-diskstats | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'Documentation/ABI/testing/procfs-diskstats')
| -rw-r--r-- | Documentation/ABI/testing/procfs-diskstats | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/procfs-diskstats b/Documentation/ABI/testing/procfs-diskstats index 99233902e09e..f91a973a37fe 100644 --- a/Documentation/ABI/testing/procfs-diskstats +++ b/Documentation/ABI/testing/procfs-diskstats | |||
| @@ -8,7 +8,7 @@ Description: | |||
| 8 | 1 - major number | 8 | 1 - major number |
| 9 | 2 - minor mumber | 9 | 2 - minor mumber |
| 10 | 3 - device name | 10 | 3 - device name |
| 11 | 4 - reads completed succesfully | 11 | 4 - reads completed successfully |
| 12 | 5 - reads merged | 12 | 5 - reads merged |
| 13 | 6 - sectors read | 13 | 6 - sectors read |
| 14 | 7 - time spent reading (ms) | 14 | 7 - time spent reading (ms) |