author | Dave Airlie <airlied@redhat.com> | |
Fri, 21 Oct 2016 03:26:15 +0000 (13:26 +1000) | ||
committer | Dave Airlie <airlied@redhat.com> | |
Fri, 21 Oct 2016 03:26:15 +0000 (13:26 +1000) | ||
commit | e947f03d9367d8fdce1054c7df2387662a9daa50 | |
tree | ae1ecc880669af2ef91ff6edf21853b466204056 | tree | snapshot (tar.xz tar.gz zip) |
parent | 961050d7284e5a17a6e13b3f7341696a99cae607 | commit | diff |
parent | ea908ba8f73446dfbf87ff71f7cadb1994d2c5bb | commit | diff |
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
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