xenbits.xensource.com Git - qemu-xen-4.3-testing.git/commit

]> xenbits.xensource.com Git - qemu-xen-4.3-testing.git/commit

projects / qemu-xen-4.3-testing.git / commit

author	Ian Jackson <ian.jackson@eu.citrix.com>
	Wed, 28 Jan 2009 17:15:40 +0000 (17:15 +0000)
committer	Ian Jackson <Ian.Jackson@eu.citrix.com>
	Wed, 28 Jan 2009 17:15:40 +0000 (17:15 +0000)
commit	635fe25273eeed178204702f422458973be2d3b3
tree	5632e77f8c94159bf27d5b15d0b75036dc17a7d4	tree
parent	a61846ca32238279dedfbf069cf4b8cf0aa380a5	commit \| diff
parent	9fd8d8d70db785c7a18fe6788a66dcf1c095a7ad	commit \| diff

Merge branch 'upstream' into qemu

Conflicts:

.gitignore
Makefile
audio/audio.c
block-qcow2.c
block-vvfat.c
block.c
cutils.c
dyngen.c
hw/ide.c
monitor.c
readline.c
target-ppc/translate_init.c
usb-linux.c
vl.c
vnc.c

30 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
block-cloop.c	diff1 \|	diff2 \|	blob \| history
block-dmg.c	diff1 \|	diff2 \|	blob \| history
block-qcow.c	diff1 \|	diff2 \|	blob \| history
block-qcow2.c	diff1 \|	diff2 \|	blob \| history
block-raw-posix.c	diff1 \|	diff2 \|	blob \| history
block-vmdk.c	diff1 \|	diff2 \|	blob \| history
block-vvfat.c	diff1 \|	diff2 \|	blob \| history
block.c	diff1 \|	diff2 \|	blob \| history
block.h	diff1 \|	diff2 \|	blob \| history
block_int.h	diff1 \|	diff2 \|	blob \| history
bt-host.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
darwin-user/machload.c	diff1 \|	diff2 \|	blob \| history
elf_ops.h	diff1 \|	diff2 \|	blob \| history
hw/ide.c	diff1 \|	diff2 \|	blob \| history
hw/pci.c	diff1 \|	diff2 \|	blob \| history
hw/scsi-disk.c	diff1 \|	diff2 \|	blob \| history
loader.c	diff1 \|	diff2 \|	blob \| history
osdep.c	diff1 \|	diff2 \|	blob \| history
osdep.h	diff1 \|	diff2 \|	blob \| history
qemu-char.c	\|	diff2 \|	blob \| history
qemu-common.h	diff1 \|	diff2 \|	blob \| history
qemu-sockets.c	\|	diff2 \|	blob \| history
qemu_socket.h	diff1 \|	diff2 \|	blob \| history
target-ppc/translate_init.c	diff1 \|	diff2 \|	blob \| history
tests/linux-test.c	diff1 \|	diff2 \|	blob \| history
tests/qruncom.c	diff1 \|	diff2 \|	blob \| history
usb-linux.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file to name it for gitweb.

RSS Atom

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
block-cloop.c	diff1 \|	diff2 \|	blob \| history
block-dmg.c	diff1 \|	diff2 \|	blob \| history
block-qcow.c	diff1 \|	diff2 \|	blob \| history
block-qcow2.c	diff1 \|	diff2 \|	blob \| history
block-raw-posix.c	diff1 \|	diff2 \|	blob \| history
block-vmdk.c	diff1 \|	diff2 \|	blob \| history
block-vvfat.c	diff1 \|	diff2 \|	blob \| history
block.c	diff1 \|	diff2 \|	blob \| history
block.h	diff1 \|	diff2 \|	blob \| history
block_int.h	diff1 \|	diff2 \|	blob \| history
bt-host.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
darwin-user/machload.c	diff1 \|	diff2 \|	blob \| history
elf_ops.h	diff1 \|	diff2 \|	blob \| history
hw/ide.c	diff1 \|	diff2 \|	blob \| history
hw/pci.c	diff1 \|	diff2 \|	blob \| history
hw/scsi-disk.c	diff1 \|	diff2 \|	blob \| history
loader.c	diff1 \|	diff2 \|	blob \| history
osdep.c	diff1 \|	diff2 \|	blob \| history
osdep.h	diff1 \|	diff2 \|	blob \| history
qemu-char.c	\|	diff2 \|	blob \| history
qemu-common.h	diff1 \|	diff2 \|	blob \| history
qemu-sockets.c	\|	diff2 \|	blob \| history
qemu_socket.h	diff1 \|	diff2 \|	blob \| history
target-ppc/translate_init.c	diff1 \|	diff2 \|	blob \| history
tests/linux-test.c	diff1 \|	diff2 \|	blob \| history
tests/qruncom.c	diff1 \|	diff2 \|	blob \| history
usb-linux.c	diff1 \|	diff2 \|	blob \| history