]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1afc48 aaf55b4)
Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 22 Jul 2011 14:23:43 +0000 (09:23 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 22 Jul 2011 14:23:43 +0000 (09:23 -0500)
1  2 
hw/virtio-serial-bus.c patch | diff1 | diff2 | blob | history

diff --cc hw/virtio-serial-bus.c
Simple merge
Qemu copy for testing