Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes