]> git.proxmox.com Git - qemu.git/commit - hw/milkymist-softusb.c
Merge remote-tracking branch 'aneesh/1.0-fixes' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 15:37:49 +0000 (09:37 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Dec 2011 15:37:49 +0000 (09:37 -0600)
commitf6480ca3f3423be5bee8b673ee6f5cc387659def
tree35941ed726db5c27941dbc22d4c5a1ef6b166d09
parentcac1e30af72c4cf289750193426ebd5d2b6bd1d5
parent8b8882722210334f19b41950c82c529e33f97b00
Merge remote-tracking branch 'aneesh/1.0-fixes' into staging
qerror.c