]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Merge tag 'drm-vc4-fixes-2016-06-06' into drm-vc4-next
authorEric Anholt <eric@anholt.net>
Fri, 8 Jul 2016 01:53:53 +0000 (18:53 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 8 Jul 2016 01:53:53 +0000 (18:53 -0700)
Merge Mario's get_vblank_counter fix forward to prevent conflicts with
his followon patch to add precise vblank timestamping.


Trivial merge