From: Dave Airlie <airlied@redhat.com>
Date: Wed, 4 May 2016 09:53:15 +0000 (+1000)
Subject: Merge tag 'drm-hisilicon-next-2016-04-29' of github.com:xin3liang/linux into drm... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4946dd2e14d252cd04e188ed6a4b794541d1c3ce;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'drm-hisilicon-next-2016-04-29' of github.com:xin3liang/linux into drm-next

drm-hisilicon-next for 4.7

Add new hisilicon kirin drm driver:
- Add maintainer for hisilicon DRM driver
- Add support for external bridge
- Add designware dsi host driver
- Add designware dsi encoder driver
- Add cma fbdev and hotplug
- Add vblank driver for ADE
- Add plane driver for ADE
- Add crtc driver for ADE
- Add hisilicon kirin drm master driver
- Add device tree binding for hi6220 display subsystem

* tag 'drm-hisilicon-next-2016-04-29' of github.com:xin3liang/linux:
  MAINTAINERS: Add maintainer for hisilicon DRM driver
  drm/hisilicon: Add support for external bridge
  drm/hisilicon: Add designware dsi host driver
  drm/hisilicon: Add designware dsi encoder driver
  drm/hisilicon: Add cma fbdev and hotplug
  drm/hisilicon: Add vblank driver for ADE
  drm/hisilicon: Add plane driver for ADE
  drm/hisilicon: Add crtc driver for ADE
  drm/hisilicon: Add hisilicon kirin drm master driver
  drm/hisilicon: Add device tree binding for hi6220 display subsystem
---

4946dd2e14d252cd04e188ed6a4b794541d1c3ce
diff --cc MAINTAINERS
index d1d6498af02f,02462fd63223..f262128644e6
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3851,8 -3851,19 +3851,18 @@@ M:	Patrik Jakobsson <patrik.r.jakobsson
  L:	dri-devel@lists.freedesktop.org
  T:	git git://github.com/patjak/drm-gma500
  S:	Maintained
 -F:	drivers/gpu/drm/gma500
 -F:	include/drm/gma500*
 +F:	drivers/gpu/drm/gma500/
  
+ DRM DRIVERS FOR HISILICON
+ M:	Xinliang Liu <z.liuxinliang@hisilicon.com>
+ R:	Xinwei Kong <kong.kongxinwei@hisilicon.com>
+ R:	Chen Feng <puck.chen@hisilicon.com>
+ L:	dri-devel@lists.freedesktop.org
+ T:	git git://github.com/xin3liang/linux.git
+ S:	Maintained
+ F:	drivers/gpu/drm/hisilicon/
+ F:	Documentation/devicetree/bindings/display/hisilicon/
+ 
  DRM DRIVERS FOR NVIDIA TEGRA
  M:	Thierry Reding <thierry.reding@gmail.com>
  M:	Terje Bergström <tbergstrom@nvidia.com>