Merge tag 'meson-drm-fixes-for-4.10' of git://people.freedesktop.org/~narmstrong...
authorDave Airlie <airlied@redhat.com>
Sun, 8 Jan 2017 23:13:13 +0000 (09:13 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 8 Jan 2017 23:13:13 +0000 (09:13 +1000)
- plan atomic check oops fix
- fix CVBS init when HDMI is configured by bootloader
- fix CVBS VDAC disable

* tag 'meson-drm-fixes-for-4.10' of git://people.freedesktop.org/~narmstrong/linux:
  drm/meson: Fix CVBS VDAC disable
  drm/meson: Fix CVBS initialization when HDMI is configured by bootloader
  drm/meson: Fix plane atomic check when no crtc for the plane


Trivial merge