Public Git Hosting - kvm-userspace.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 53f1d24 ff3e40f)

commit	e6fd8f045bf87e8518985d1f5a0102e5f5640d5a
author	Avi Kivity <avi@qumranet.com>
	Mon, 28 Jan 2008 12:23:39 +0000 (28 14:23 +0200)
committer	Avi Kivity <avi@qumranet.com>
	Mon, 28 Jan 2008 12:23:39 +0000 (28 14:23 +0200)
tree	08686b8b6c001e381004229b56f9102973ab3c29	tree \| snapshot (tar.gz zip)
parent	53f1d244459b75ba8c881f78f7e4d408b36eb29d	commit \| diff
parent	ff3e40fd491bbf863be71edf5c3db5ad6d87dee3	commit \| diff

Merge branch 'qemu-cvs'

Conflicts:

qemu/hw/ide.c
qemu/vl.c

16 files changed:

qemu/Makefile	diff1 \|	diff2 \|	blob \| history
qemu/Makefile.target	diff1 \|	diff2 \|	blob \| history
qemu/audio/wavaudio.c	diff1 \|	diff2 \|	blob \| history
qemu/block-raw-posix.c	diff1 \|	diff2 \|	blob \| history
qemu/block-vmdk.c	diff1 \|	diff2 \|	blob \| history
qemu/configure	diff1 \|	diff2 \|	blob \| history
qemu/cpu-all.h	diff1 \|	diff2 \|	blob \| history
qemu/cpu-exec.c	diff1 \|	diff2 \|	blob \| history
qemu/exec.c	diff1 \|	diff2 \|	blob \| history
qemu/hw/boards.h	diff1 \|	diff2 \|	blob \| history
qemu/hw/ide.c	diff1 \|	diff2 \|	blob \| history
qemu/hw/mips_malta.c	diff1 \|	diff2 \|	blob \| history
qemu/qemu-doc.texi	diff1 \|	diff2 \|	blob \| history
qemu/qemu-img.c	diff1 \|	diff2 \|	blob \| history
qemu/vl.c	diff1 \|	diff2 \|	blob \| history
qemu/vnc.c	diff1 \|	diff2 \|	blob \| history

kvm userspace components