diff options
author | Anthony Liguori | 2011-06-08 19:15:11 +0200 |
---|---|---|
committer | Anthony Liguori | 2011-06-08 19:15:11 +0200 |
commit | ac779fe2334ebea5d4a365b053d786f7748a1db5 (patch) | |
tree | 5459fe587195dcb74b3b2ca19dc2d4a39a9fb31e /fsdev/qemu-fsdev-dummy.c | |
parent | Merge remote-tracking branch 'stefanha/trivial-patches' into staging (diff) | |
parent | qxl: fix cmdlog for vga (diff) | |
download | qemu-ac779fe2334ebea5d4a365b053d786f7748a1db5.tar.gz qemu-ac779fe2334ebea5d4a365b053d786f7748a1db5.tar.xz qemu-ac779fe2334ebea5d4a365b053d786f7748a1db5.zip |
Merge remote-tracking branch 'spice/spice.v37' into staging
Conflicts:
vl.c
Diffstat (limited to 'fsdev/qemu-fsdev-dummy.c')
0 files changed, 0 insertions, 0 deletions