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

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

projects / qemu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a8a826a 1dd3a74)

author	Paolo Bonzini <pbonzini@redhat.com>
	Mon, 17 Dec 2012 17:17:08 +0000 (18:17 +0100)
committer	Paolo Bonzini <pbonzini@redhat.com>
	Mon, 17 Dec 2012 17:56:22 +0000 (18:56 +0100)
commit	6f991980a5e96f93a9f676959df2dcba665665ef
tree	e6f46c0531e8a05b22be4c5adf7f7fb31afa6d13	tree
parent	a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0	commit \| diff
parent	1dd3a74d2ee2d873cde0b390b536e45420b3fe05	commit \| diff

Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

17 files changed:

Makefile.objs	diff1 \|	diff2 \|	blob \| history
arch_init.c	diff1 \|	diff2 \|	blob \| history
hw/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/ide/core.c	diff1 \|	diff2 \|	blob \| history
hw/openpic.c	diff1 \|	diff2 \|	blob \| history
hw/pci/Makefile.objs	\|	diff2 \|	blob \| history
hw/pci/msix.c	\|	diff2 \|	blob \| history
hw/ppc/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/ppc/e500.c	diff1 \|	diff2 \|	blob \| history
hw/ppc_newworld.c	diff1 \|	diff2 \|	blob \| history
hw/ppce500_pci.c	diff1 \|	diff2 \|	blob \| history
hw/realview.c	diff1 \|	diff2 \|	blob \| history
hw/spapr.c	diff1 \|	diff2 \|	blob \| history
hw/versatilepb.c	diff1 \|	diff2 \|	blob \| history
hw/vfio_pci.c	diff1 \|	diff2 \|	blob \| history
hw/vga.c	diff1 \|	diff2 \|	blob \| history
hw/virtio-pci.c	diff1 \|	diff2 \|	blob \| history

Qemu copy for testing