Merge branch 'drm-armada-fixes' of git://git.armlinux.org.uk/~rmk/linux-arm into...
authorDave Airlie <airlied@redhat.com>
Fri, 21 Oct 2016 03:26:15 +0000 (13:26 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 21 Oct 2016 03:26:15 +0000 (13:26 +1000)
commite947f03d9367d8fdce1054c7df2387662a9daa50
treeae1ecc880669af2ef91ff6edf21853b466204056
parent961050d7284e5a17a6e13b3f7341696a99cae607
parentea908ba8f73446dfbf87ff71f7cadb1994d2c5bb
Merge branch 'drm-armada-fixes' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-fixes

One small fix for Armada, where the clock prepare/enable counts were
going awry.

* 'drm-armada-fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  drm/armada: fix clock counts