Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

[~andy/linux] / Documentation / trace / ring-buffer-design.txt

diff --git a/Documentation/trace/ring-buffer-design.txt b/Documentation/trace/ring-buffer-design.txt
index d299ff31df57f0b4f1ea25cf328e77390eee50ee..7d350b496585863daaa09e671c421453ba163d84 100644 (file)
--- a/Documentation/trace/ring-buffer-design.txt
+++ b/Documentation/trace/ring-buffer-design.txt
@@ -237,7 +237,7 @@ with the previous write.
       |written  |
       +---------+
       |written  |
-      +---------+  <--- next positon for write (current commit)
+      +---------+  <--- next position for write (current commit)
       | empty   |
       +---------+