Merge tag 'drm/atmel-hlcdc/4.8-fixes' of github.com:bbrezillon/linux-at91 into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 13 Sep 2016 00:18:02 +0000 (10:18 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 13 Sep 2016 00:18:02 +0000 (10:18 +1000)
commit7eebfba5c48f89e1729022459cde2b256696ba2a
treed82a7d3cd104ebc0918bd7e61804dcf09789ef9e
parent062f531ab2e959a2236ae76523be0881ade7058d
parent1ba7db07ccc2825669d6e376632316813a072887
Merge tag 'drm/atmel-hlcdc/4.8-fixes' of github.com:bbrezillon/linux-at91 into drm-fixes

Two fixes for 4.8:
- missing static specifier on atmel_hlcdc_crtc_reset()
- bug in the hardware scaling logic

* tag 'drm/atmel-hlcdc/4.8-fixes' of github.com:bbrezillon/linux-at91:
  drm/atmel-hlcdc: Make ->reset() implementation static
  drm: atmel-hlcdc: Fix vertical scaling