From: Eric Anholt <eric@anholt.net>
Date: Fri, 8 Jul 2016 01:53:53 +0000 (-0700)
Subject: Merge tag 'drm-vc4-fixes-2016-06-06' into drm-vc4-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9f4e62f1520de97c302d65486b146b51c6ffde7c;p=linux.git

Merge tag 'drm-vc4-fixes-2016-06-06' into drm-vc4-next

Merge Mario's get_vblank_counter fix forward to prevent conflicts with
his followon patch to add precise vblank timestamping.
---

9f4e62f1520de97c302d65486b146b51c6ffde7c