diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-03-28 06:30:41 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-03-28 06:30:41 +0200 |
| commit | 2b4f44eec2be2688511c2b617d0e1b4f94c45ba4 (patch) | |
| tree | 533c03602f4ae6d6404db6fa56c88e6f83e1bebe /Documentation/gpu | |
| parent | Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | Linux 4.16-rc7 (diff) | |
| download | linux-2b4f44eec2be2688511c2b617d0e1b4f94c45ba4.tar.xz linux-2b4f44eec2be2688511c2b617d0e1b4f94c45ba4.zip | |
Backmerge tag 'v4.16-rc7' into drm-next
Linux 4.16-rc7
This was requested by Daniel, and things were getting
a bit hard to reconcile, most of the conflicts were
trivial though.
Diffstat (limited to 'Documentation/gpu')
| -rw-r--r-- | Documentation/gpu/tve200.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gpu/tve200.rst b/Documentation/gpu/tve200.rst index 69b17b324e12..152ea9398f7e 100644 --- a/Documentation/gpu/tve200.rst +++ b/Documentation/gpu/tve200.rst @@ -3,4 +3,4 @@ ================================== .. kernel-doc:: drivers/gpu/drm/tve200/tve200_drv.c - :doc: Faraday TV Encoder 200 + :doc: Faraday TV Encoder TVE200 DRM Driver |