diff options
author | 2013-03-15 10:47:00 -0500 | |
---|---|---|
committer | 2013-03-15 10:47:00 -0500 | |
commit | d4d7682484f339d70355b165a15f8f5e83638e40 (patch) | |
tree | 285ee8c912a0d7a461c38cd36ac37037f207a443 /ui/sdl.c | |
parent | qga/main.c: Don't use g_key_file_get/set_int64 (diff) | |
parent | virtio-ccw: Wire up virtio-rng. (diff) | |
download | qemu-d4d7682484f339d70355b165a15f8f5e83638e40.tar.xz qemu-d4d7682484f339d70355b165a15f8f5e83638e40.zip |
Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging
# By Christian Borntraeger (1) and Cornelia Huck (1)
# Via Cornelia Huck
* cohuck/virtio-ccw-upstr:
virtio-ccw: Wire up virtio-rng.
virtio-ccw: remove qdev_unparent in unplug routing
Diffstat (limited to 'ui/sdl.c')
0 files changed, 0 insertions, 0 deletions