Merge branch 'virtio-gpu-drm-next' of git://git.kraxel.org/linux into drm-next

Yay, thanks to Gerd for pull this together.

* 'virtio-gpu-drm-next' of git://git.kraxel.org/linux:
  Add MAINTAINERS entry for virtio-gpu.
  Add virtio gpu driver.
  drm_vblank_get: don't WARN_ON in case vblanks are not initialized
  break kconfig dependency loop

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/Makefile
index eda180d5bdffd44fbb611ad7a33fd22dedf7d73c,8e75f8194bde4e5e0a3f146635a4348be3c58506..15eb710ec11479202f7aab3621caf8378ec7b53b
--- 1/drivers/gpu/drm/Makefile
--- 2/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -58,9 -58,10 +58,10 @@@ obj-$(CONFIG_DRM_ATMEL_HLCDC)       += atmel-
  obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
  obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
  obj-$(CONFIG_DRM_OMAP)        += omapdrm/
 -obj-$(CONFIG_DRM_TILCDC)      += tilcdc/
 +obj-y                 += tilcdc/
  obj-$(CONFIG_DRM_QXL) += qxl/
  obj-$(CONFIG_DRM_BOCHS) += bochs/
+ obj-$(CONFIG_DRM_VIRTIO_GPU) += virtio/
  obj-$(CONFIG_DRM_MSM) += msm/
  obj-$(CONFIG_DRM_TEGRA) += tegra/
  obj-$(CONFIG_DRM_STI) += sti/

diff --cc drivers/gpu/drm/drm_irq.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge