Merge tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux...