Merge branch 'for-upstream/malidp-fixes' of git://linux-arm.org/linux-ld into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 15 Mar 2017 01:30:46 +0000 (11:30 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 15 Mar 2017 01:30:46 +0000 (11:30 +1000)
* 'for-upstream/malidp-fixes' of git://linux-arm.org/linux-ld:
  drm: mali-dp: Fix smart layer not going to composition
  drm: mali-dp: Remove mclk rate management


Trivial merge