diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.com> | 2018-07-06 13:34:13 -0300 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.com> | 2018-07-06 13:34:13 -0300 |
| commit | e22e953189f7b3a3bfc7efb511d2b1d1454adde5 (patch) | |
| tree | 87e56e966e1f676f2c9389c41aa5c37969f757f1 /drivers/gpu/drm/omapdrm/dss/display.c | |
| parent | a012024571d98e2e4bf29a9168fb7ddc44b7ab86 (diff) | |
| parent | 4da1d4c751c9b1b713c13043bad7c4d27cd1418c (diff) | |
| download | linux-e22e953189f7b3a3bfc7efb511d2b1d1454adde5.tar.gz | |
Merge drm-upstream/drm-next into drm-misc-next
Pull in the malidp writeback implementation for further work on writeback in drm-misc-next.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/display.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c index 424143128cd4..9e7fcbd57e52 100644 --- a/drivers/gpu/drm/omapdrm/dss/display.c +++ b/drivers/gpu/drm/omapdrm/dss/display.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2009 Nokia Corporation - * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com> + * Author: Tomi Valkeinen <tomi.valkeinen@ti.com> * * Some code and ideas taken from drivers/video/omap/ driver * by Imre Deak. |