Merge tag 'topic/drm-fixes-2016-04-07' of git://anongit.freedesktop.org/drm-intel...