diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-18 05:17:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-18 05:17:17 -0400 |
| commit | a2fe194723f6e4990d01d8c208c7b138fd410522 (patch) | |
| tree | 7aee93fa8f4ba1e18b56fa7d8eab75d249fc6966 /Documentation/DocBook/media/v4l/controls.xml | |
| parent | c3b7cdf180090d2686239a75bb0ae408108ed749 (diff) | |
| parent | a018540141a931f5299a866907b27886916b4374 (diff) | |
Merge branch 'linus' into perf/core
Pick up the latest ring-buffer fixes, before applying a new fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/DocBook/media/v4l/controls.xml')
| -rw-r--r-- | Documentation/DocBook/media/v4l/controls.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 676bc46f9c52..cda0dfb6769a 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml | |||
| @@ -3988,7 +3988,7 @@ interface and may change in the future.</para> | |||
| 3988 | from RGB to Y'CbCr color space. | 3988 | from RGB to Y'CbCr color space. |
| 3989 | </entry> | 3989 | </entry> |
| 3990 | </row> | 3990 | </row> |
| 3991 | <row id = "v4l2-jpeg-chroma-subsampling"> | 3991 | <row> |
| 3992 | <entrytbl spanname="descr" cols="2"> | 3992 | <entrytbl spanname="descr" cols="2"> |
| 3993 | <tbody valign="top"> | 3993 | <tbody valign="top"> |
| 3994 | <row> | 3994 | <row> |