OSDN Git Service

Merge branch 'virtio-gpu-drm-next' of git://git.kraxel.org/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 3 Jun 2015 23:36:39 +0000 (09:36 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 3 Jun 2015 23:36:39 +0000 (09:36 +1000)
commit63e1456122761745082d325329ccce749a426059
treeab23814f68ab4af1a45c7e9631561b2a1b01b430
parent6aa627250354c73ec705040b3a327b2915756fac
parent4ad6ee91aa9f730136eccc02dfc1df4ad56baa57
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
MAINTAINERS
drivers/gpu/drm/Makefile
drivers/gpu/drm/drm_irq.c
include/drm/drmP.h