Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux