diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 18:01:42 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 18:01:42 +0200 |
| commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c (patch) | |
| tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d /Documentation/DocBook/media/v4l/controls.xml | |
| parent | NFS: Create custom NFS v4 write_inode() function (diff) | |
| parent | VFS: Pass mount flags to sget() (diff) | |
| download | linux-8626e4a42675ff9903f7d4fbf14d8ebc11b5926c.tar.xz linux-8626e4a42675ff9903f7d4fbf14d8ebc11b5926c.zip | |
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
Resolve conflicts with the VFS atomic open and sget changes.
Conflicts:
fs/nfs/nfs4proc.c
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> from RGB to Y'CbCr color space. </entry> </row> - <row id = "v4l2-jpeg-chroma-subsampling"> + <row> <entrytbl spanname="descr" cols="2"> <tbody valign="top"> <row> |