]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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


Trivial merge