| commit | 0dc499aff57f5e787214d5085dd1c391e0f93710 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Jun 18 13:01:04 2015 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Jun 18 13:01:04 2015 +1000 |
| tree | beb2d200871c06cdae60abb677c3f04635684d1c | |
| parent | 2aeab6884b77459029f37a1d7f741a296e5c3f5f [diff] | |
| parent | d5084f1711c8917d48006e19099060b3b8387bb5 [diff] |
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.