Merge tag 'drm-intel-fixes-2015-12-23' of git://anongit.freedesktop.org/drm-intel