diff --git a/[refs] b/[refs] index dc996d85aff2..7f1f91ae0029 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afcc8e8c3474e5771ebdd49fe4f1c2ec1df997e7 +refs/heads/master: b67a39e4b6850c0346c0b809886632d4cd2fed7d diff --git a/trunk/Documentation/DocBook/media/v4l/compat.xml b/trunk/Documentation/DocBook/media/v4l/compat.xml index 4559a6f8a5f0..c9c7d1ca8d67 100644 --- a/trunk/Documentation/DocBook/media/v4l/compat.xml +++ b/trunk/Documentation/DocBook/media/v4l/compat.xml @@ -2460,7 +2460,7 @@ that used it. It was originally scheduled for removal in 2.6.35.
- V4L2 in Linux 3.5 + V4L2 in Linux 3.6 Replaced input in