]> xenbits.xen.org Git - xenclient/ioemu.git/commit
Merge branch 'master' of ../../1/qemu-iwj
authorIan Jackson <ian.jackson@eu.citrix.com>
Fri, 13 Mar 2009 12:09:06 +0000 (12:09 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 13 Mar 2009 12:09:06 +0000 (12:09 +0000)
commit9f2b74a123c63c57b7f38cafe65eddb096f46c72
tree3f7f255fcf1272645b49bf4e3a46f4d9386edfc4
parent93b416a6b2fb4fdfd6f3a45bb22805c2bcfb8fd6
parent82787c6f689d869ad349df83ec3f58702afe00fe
Merge branch 'master' of ../../1/qemu-iwj

Conflicts:

block-raw-posix.c
block-raw-posix.c
hw/pci.h
hw/piix_pci.c
vl.c