]> xenbits.xensource.com Git - qemu-xen-3.4-testing.git/commit
Merge branch 'master' into xen
authorIan Jackson <iwj@mariner.uk.xensource.com>
Fri, 23 May 2008 17:28:28 +0000 (18:28 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 23 May 2008 17:28:28 +0000 (18:28 +0100)
commit14f79a01a27be349c07103add63b033d2980c069
treeae9374991087cc655a6c2fb68dddc0c65c6a5ee8
parentcf858dfba66eeaf3d3881fef827e53f7789ececa
parent266bcd8976949cd11f01b002275902539752dcfd
Merge branch 'master' into xen

Conflicts:
hw/ide.c
hw/ide.c
hw/pci.c
vl.c