Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued