From: Dave Airlie <airlied@redhat.com>
Date: Thu, 18 Jun 2015 03:01:04 +0000 (+1000)
Subject: Merge branch 'virtio-gpu-drm-next' of git://git.kraxel.org/linux into drm-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~17^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dc499aff57f5e787214d5085dd1c391e0f93710;p=pandora-kernel.git

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

fixes and virtio-vga support.

* 'virtio-gpu-drm-next' of git://git.kraxel.org/linux:
  virtio-gpu: add locking for vbuf pool
  drm/virtgpu: initialise fbdev after getting initial display info
  Add virtio-vga bits.
---

0dc499aff57f5e787214d5085dd1c391e0f93710