diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-10 12:10:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-10 12:10:19 +0200 |
| commit | fc33a8943efb25bc025750c7f4ea643fae526860 (patch) | |
| tree | a3af3a1d5d83b7f9721405e79dc89bba1a6c27ad /Documentation/media/v4l-drivers/index.rst | |
| parent | x86/topology: Remove the unused parent_node() macro (diff) | |
| parent | Merge tag 'pinctrl-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-fc33a8943efb25bc025750c7f4ea643fae526860.tar.xz linux-fc33a8943efb25bc025750c7f4ea643fae526860.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/media/v4l-drivers/index.rst')
| -rw-r--r-- | Documentation/media/v4l-drivers/index.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst index 2e24d6806052..10f2ce42ece2 100644 --- a/Documentation/media/v4l-drivers/index.rst +++ b/Documentation/media/v4l-drivers/index.rst @@ -41,6 +41,7 @@ For more details see the file COPYING in the source distribution of Linux. cx88 davinci-vpbe fimc + imx ivtv max2175 meye |