Merge branch 'drm-intel-fixes' of git://anongit.freedesktop.org/~ickle/drm-intel