]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a69fb35 5300f1a)
Merge remote-tracking branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 5 May 2011 18:05:32 +0000 (13:05 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 5 May 2011 18:05:32 +0000 (13:05 -0500)
1  2 
hw/usb-ohci.c patch | diff1 | diff2 | blob | history

diff --cc hw/usb-ohci.c
Simple merge
Qemu copy for testing