]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c45d1fc a7fb71d)
Merge remote-tracking branch 'kraxel/usb.17' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 27 Jun 2011 19:59:08 +0000 (14:59 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 27 Jun 2011 19:59:08 +0000 (14:59 -0500)
1  2 
hw/usb-ccid.c patch | diff1 | diff2 | blob | history

diff --cc hw/usb-ccid.c
Simple merge
QEMU mirror