diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-26 09:19:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-26 09:19:13 +0200 |
| commit | 413d63d71b222108d19703f3fd5cf9108652a730 (patch) | |
| tree | 4680de6aebb6430dc5f3d9327f86d65149e6b5ae /Documentation/media/uapi/v4l/subdev-image-processing-crop.svg | |
| parent | d6c8103b0265d8db30e20e948a4f06382bbdaea7 (diff) | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) | |
| download | op-kernel-dev-413d63d71b222108d19703f3fd5cf9108652a730.zip op-kernel-dev-413d63d71b222108d19703f3fd5cf9108652a730.tar.gz | |
Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts
Conflicts:
arch/x86/kernel/head64.c
arch/x86/mm/mmap.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/media/uapi/v4l/subdev-image-processing-crop.svg')
| -rw-r--r-- | Documentation/media/uapi/v4l/subdev-image-processing-crop.svg | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg b/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg index 1903dd3..ee1df49 100644 --- a/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg +++ b/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg @@ -18,11 +18,11 @@ id="metadata100"> <rdf:RDF> <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> |
