]> xenbits.xensource.com Git - qemu-xen-4.1-testing.git/commit
Merge branch 'upstream' into qemu
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 22 Oct 2008 17:08:52 +0000 (18:08 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 22 Oct 2008 17:08:52 +0000 (18:08 +0100)
commit66ac44284e4cd259cb97f88d4fe732d96cd1694f
tree28c1ab6e37ff28e341a1ad54acf8f1b116c6c68e
parent3df1a17b0ab8a8be4e3c9d6b2fa0812c652520f1
parent4be27dbbde2aed1da305b83043caa6f0f0ca4309
Merge branch 'upstream' into qemu

Conflicts:

block.h
linux-user/elfload.c
13 files changed:
block-raw-posix.c
block-raw-win32.c
block.c
block.h
configure
elf_ops.h
hw/scsi-disk.c
monitor.c
osdep.h
qemu_socket.h
target-ppc/translate_init.c
usb-linux.c
vl.c