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