Merge tag 'drm-hisilicon-next-2016-07-04' of github.com:xin3liang/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 8 Jul 2016 03:30:52 +0000 (13:30 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 8 Jul 2016 03:30:52 +0000 (13:30 +1000)
drm-hisilicon-next

* tag 'drm-hisilicon-next-2016-07-04' of github.com:xin3liang/linux:
  drm/hisilicon: Fix ADE vblank on/off handling
  drm/hisilicon: add select HISI_KIRIN_DW_DSI
  drm/hisilicon: Fix return value check in ade_dts_parse()


Trivial merge