]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cd20f8 37f95bf)
Merge remote branch 'amit/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Feb 2011 21:20:56 +0000 (15:20 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Feb 2011 21:20:56 +0000 (15:20 -0600)
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