diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-11-25 09:58:25 +0300 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-11-25 09:58:25 +0300 |
commit | 04ea7dcba47325d8d2256aaf0cbd21818f280d87 (patch) | |
tree | f3f150702b234a631e749f45e73692e0dcd95dcd /MAINTAINERS | |
parent | 2761ba6c0925ca9c5b917a95f68135d9dce443fb (diff) | |
parent | 43167f6c7d7172e0a6cb1ecaa1771a2f457fd165 (diff) | |
download | linux-04ea7dcba47325d8d2256aaf0cbd21818f280d87.tar.xz |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Pull in the hibmc driver stuff so I can apply 2 trivial fixups from
Dan&Arnd.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3862af19b9a3..520002480058 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4153,6 +4153,7 @@ F: drivers/gpu/drm/gma500/ DRM DRIVERS FOR HISILICON M: Xinliang Liu <z.liuxinliang@hisilicon.com> +M: Rongrong Zou <zourongrong@gmail.com> R: Xinwei Kong <kong.kongxinwei@hisilicon.com> R: Chen Feng <puck.chen@hisilicon.com> L: dri-devel@lists.freedesktop.org |