diff --git a/[refs] b/[refs] index 0051a92a47a3..7c443438beda 100644 --- 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 index 802875413873..77bd0a42f19d 100644 --- 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