Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm...