Merge tag 'drm-fsl-dcu-for-v4.11' of http://git.agner.ch/git/linux-drm-fsl-dcu into...
authorDave Airlie <airlied@redhat.com>
Fri, 10 Feb 2017 00:12:56 +0000 (10:12 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 10 Feb 2017 00:12:56 +0000 (10:12 +1000)
commitf320d3572344d34a6d8b516261416df0193602f6
tree1427043d37be6a594b247788640b8687f4171e02
parent79b33494af518d3f20d1b7365a0c717daff83ab6
parentef15d36154cc741d7ded4ae4fa0cf7987354e313
Merge tag 'drm-fsl-dcu-for-v4.11' of git.agner.ch/git/linux-drm-fsl-dcu into drm-next

two minor fixes.

* tag 'drm-fsl-dcu-for-v4.11' of http://git.agner.ch/git/linux-drm-fsl-dcu:
  drm/fsl-dcu: check for clk_prepare_enable() error
  drm/fsl-dcu: remove unneeded 'ret' assignment