git.proxmox.com Git - mirror_qemu.git/commit

]> git.proxmox.com Git - mirror_qemu.git/commit

projects / mirror_qemu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 35f7546 0b862ce)

author	Michael S. Tsirkin <mst@redhat.com>
	Tue, 14 Jun 2011 14:51:11 +0000 (17:51 +0300)
committer	Michael S. Tsirkin <mst@redhat.com>
	Wed, 15 Jun 2011 15:27:15 +0000 (18:27 +0300)
commit	befeac45d4d9afb587eca9a27d975db4a7950960
tree	aab24c856a3ea944e287d7f2591bb4bab6a56eb4	tree
parent	35f754620615138aaae0ef72602f84c88fd8de0f	commit \| diff
parent	0b862cedf36d927818c50584ddd611b0370673df	commit \| diff

Merge remote-tracking branch 'origin/master' into pci

Conflicts:
hw/virtio-pci.c

21 files changed:

exec.c	diff1 \|	diff2 \|	blob \| history
hw/9pfs/virtio-9p-device.c	\|	diff2 \|	blob \| history
hw/ac97.c	diff1 \|	diff2 \|	blob \| history
hw/acpi_piix4.c	diff1 \|	diff2 \|	blob \| history
hw/eepro100.c	diff1 \|	diff2 \|	blob \| history
hw/ide/ich.c	diff1 \|	diff2 \|	blob \| history
hw/lsi53c895a.c	diff1 \|	diff2 \|	blob \| history
hw/msi.c	diff1 \|	diff2 \|	blob \| history
hw/msix.c	diff1 \|	diff2 \|	blob \| history
hw/pc_piix.c	diff1 \|	diff2 \|	blob \| history
hw/pci.c	diff1 \|	diff2 \|	blob \| history
hw/pci.h	diff1 \|	diff2 \|	blob \| history
hw/pci_regs.h	diff1 \|	diff2 \|	blob \| history
hw/pcie_aer.c	diff1 \|	diff2 \|	blob \| history
hw/piix_pci.c	diff1 \|	diff2 \|	blob \| history
hw/qxl.c	diff1 \|	diff2 \|	blob \| history
hw/rtl8139.c	diff1 \|	diff2 \|	blob \| history
hw/usb-ohci.c	diff1 \|	diff2 \|	blob \| history
hw/usb-uhci.c	diff1 \|	diff2 \|	blob \| history
hw/virtio-pci.c	diff1 \|	diff2 \|	blob \| history
hw/virtio-pci.h	\|	diff2 \|	blob \| history

QEMU mirror