]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'drm-qemu-20170110' of git://git.kraxel.org/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Sun, 22 Jan 2017 23:25:53 +0000 (09:25 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 22 Jan 2017 23:25:53 +0000 (09:25 +1000)
drm-qemu: virtio sparse fix, MAINTAINERS updates.

* tag 'drm-qemu-20170110' of git://git.kraxel.org/linux:
  drm: flip cirrus driver status to "obsolete".
  drm: update MAINTAINERS for qemu drivers (bochs, cirrus, qxl, virtio-gpu)
  drm/virtio: fix framebuffer sparse warning

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge