Public Git Hosting - qemu-kvm/fedora.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 6cc4e88 9a717b5)

commit	1b4f3f04cceba9c40011234b73cdb242eee3c3d6
author	Avi Kivity <avi@redhat.com>
	Thu, 22 Jan 2009 10:58:05 +0000 (22 12:58 +0200)
committer	Avi Kivity <avi@redhat.com>
	Thu, 22 Jan 2009 10:58:05 +0000 (22 12:58 +0200)
tree	3788c54e926acffcccfd855a8eb220a5fb507f19	tree \| snapshot (tar.gz zip)
parent	6cc4e88dfb81332d1e74a8811b8bb22e9bc5439a	commit \| diff
parent	9a717b55df29b2b0dd0553ccfa656671bad043d1	commit \| diff

Merge branch 'qemu-cvs'

Conflicts:
qemu/Makefile.target
qemu/hw/cirrus_vga.c
qemu/hw/ide.c
qemu/pc-bios/bios.bin
qemu/vl.c

Signed-off-by: Avi Kivity <avi@redhat.com>

Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.target	diff1 \|	diff2 \|	blob \| history
gdbstub.c	diff1 \|	diff2 \|	blob \| history
hw/acpi.c	diff1 \|	diff2 \|	blob \| history
hw/cirrus_vga.c	diff1 \|	diff2 \|	blob \| history
hw/ide.c	diff1 \|	diff2 \|	blob \| history
linux-user/main.c	diff1 \|	diff2 \|	blob \| history
sysemu.h	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history

Patches shipped by Fedora