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

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

diff --cc MAINTAINERS
index d1d6498af02fc6692112d0ca53c846f962e17fad,02462fd63223b8671cc74bac4cb56ed03920b13c..f262128644e68b82dd316c0f5ede6224bcc56a1b
--- 1/MAINTAINERS
--- 2/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>