---

yaml --- r: 357515 b: refs/heads/master c: c240ac9 h: refs/heads/master i: 357513: c1605a7 357511: 91258e1 v: v3
git-mirror · Feb 8, 2013 · c0ea030 · c0ea030
1 parent fd1e8cc
commit c0ea030
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d0ee461fd173fea8ca254924263f189a3f0dc08
+refs/heads/master: c240ac9bc7470d4d060df3688b8e590cbbab9eb5
diff --git a/trunk/Documentation/media-framework.txt b/trunk/Documentation/media-framework.txt
@@ -336,7 +336,7 @@ Calls to media_entity_pipeline_start() can be nested. The pipeline pointer must
 be identical for all nested calls to the function.
 
 media_entity_pipeline_start() may return an error. In that case, it will
-clean up any the changes it did by itself.
+clean up any of the changes it did by itself.
 
 When stopping the stream, drivers must notify the entities with