diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /Documentation/trace | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'Documentation/trace')
| -rw-r--r-- | Documentation/trace/ring-buffer-design.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/trace/ring-buffer-design.txt b/Documentation/trace/ring-buffer-design.txt index d299ff31df57..7d350b496585 100644 --- a/Documentation/trace/ring-buffer-design.txt +++ b/Documentation/trace/ring-buffer-design.txt | |||
| @@ -237,7 +237,7 @@ with the previous write. | |||
| 237 | |written | | 237 | |written | |
| 238 | +---------+ | 238 | +---------+ |
| 239 | |written | | 239 | |written | |
| 240 | +---------+ <--- next positon for write (current commit) | 240 | +---------+ <--- next position for write (current commit) |
| 241 | | empty | | 241 | | empty | |
| 242 | +---------+ | 242 | +---------+ |
| 243 | 243 | ||