Merge branch 'drm-armada-fixes' of git://git.armlinux.org.uk/~rmk/linux-arm into...
authorDave Airlie <airlied@redhat.com>
Sun, 15 Jul 2018 23:57:22 +0000 (09:57 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 15 Jul 2018 23:57:35 +0000 (09:57 +1000)
Two armada fixes.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180713075427.GA16160@rmk-PC.armlinux.org.uk

Trivial merge