Merge tag 'drm-atmel-hlcdc-fixes/for-4.7-rc5' of github.com:bbrezillon/linux-at91...
authorDave Airlie <airlied@redhat.com>
Fri, 24 Jun 2016 00:34:49 +0000 (10:34 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 24 Jun 2016 00:34:49 +0000 (10:34 +1000)
Two bug fixes for the atmel-hlcdc driver.

* tag 'drm-atmel-hlcdc-fixes/for-4.7-rc5' of github.com:bbrezillon/linux-at91:
  drm: atmel-hlcdc: Fix OF graph parsing
  drm: atmel-hlcdc: actually disable scaling when no scaling is required


Trivial merge