Merge tag 'drm-vc4-fixes-2016-06-06' of github.com:anholt/linux into drm-fixes