Merge branch 'drm-rockchip-next-2017-02-07' of https://github.com/markyzq/kernel...
authorDave Airlie <airlied@redhat.com>
Wed, 8 Feb 2017 01:28:19 +0000 (11:28 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 8 Feb 2017 01:28:19 +0000 (11:28 +1000)
commit4eaa39c63caf535dc1a8cc43b9a8677a100c09e1
treeab63f9affdede388dc4000384f54027f5739c05d
parent26d7f34cae7aad9600cd40ce07ec3fbe8606a567
parent213c4b96639818a2dc8750d1b7a37672a9c9eaeb
Merge branch 'drm-rockchip-next-2017-02-07' of https://github.com/markyzq/kernel-drm-rockchip into drm-next

Single compile fix.

* 'drm-rockchip-next-2017-02-07' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: cdn-dp: fix cdn-dp complie warning