Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel