]> git.proxmox.com Git - qemu.git/commit - libcacard/vcard_emul_nss.c
Merge remote-tracking branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:15:22 +0000 (17:15 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:15:22 +0000 (17:15 -0500)
commit81e34a2401f7ffd519bb7f093e833cb48734169f
tree146a7b6eebbee1367453fde501d4462ac6d9f8b4
parente06516f565dca3636a4cbef770b191a5fcdf63ab
parentcb4b4fde82b064472c13fb9d983ca36a70e560aa
Merge remote-tracking branch 'mst/for_anthony' into staging
hw/pci.c
hw/pci_host.h
hw/virtio-net.c
hw/virtio-pci.c
net.c