summaryrefslogtreecommitdiff
path: root/Documentation/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-07-30 18:42:27 +0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-07-30 18:42:27 +0300
commit3ac52d0d219d5d973601c52e215f0e922b2b2d49 (patch)
treebf6754e2aefc89998236c0a7dd7ead295d31f0d4 /Documentation/media
parenta8f910ec66583bfb61558c3f333195b3960d832d (diff)
parent609488bc979f99f805f34e9a32c1e3b71179d10b (diff)
downloadlinux-3ac52d0d219d5d973601c52e215f0e922b2b2d49.tar.xz
Merge tag 'v5.3-rc2' into patchwork
Linux 5.3-rc2 * tag 'v5.3-rc2': (342 commits) Linux 5.3-rc2 kbuild: remove unused single-used-m gen_compile_commands: lower the entry count threshold .gitignore: Add compilation database file kbuild: remove unused objectify macro dt-bindings: Fix more $id value mismatches filenames dt-bindings: nvmem: SID: Fix the examples node names dt-bindings: nvmem: Add YAML schemas for the generic NVMEM bindings of: Fix typo in kerneldoc block: fix max segment size handling in blk_queue_virt_boundary docs: phy: Drop duplicate 'be made' fix the struct mount leak in umount_tree() MAINTAINERS: vfio-ccw: Remove myself as the maintainer s390/mm: use shared variables for sysctl range check virtio/s390: fix race on airq_areas[] s390/dma: provide proper ARCH_ZONE_DMA_BITS value btrfs: fix extent_state leak in btrfs_lock_and_flush_ordered_range Makefile: Globally enable fall-through warning drm/i915: Mark expected switch fall-throughs drm/amd/display: Mark expected switch fall-throughs ...
Diffstat (limited to 'Documentation/media')
-rw-r--r--Documentation/media/conf.py12
1 files changed, 0 insertions, 12 deletions
diff --git a/Documentation/media/conf.py b/Documentation/media/conf.py
deleted file mode 100644
index 1f194fcd2cae..000000000000
--- a/Documentation/media/conf.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8; mode: python -*-
-
-# SPDX-License-Identifier: GPL-2.0
-
-project = 'Linux Media Subsystem Documentation'
-
-tags.add("subproject")
-
-latex_documents = [
- ('index', 'media.tex', 'Linux Media Subsystem Documentation',
- 'The kernel development community', 'manual'),
-]