]> xenbits.xensource.com Git - qemu-xen-4.4-testing.git/commitdiff
Merge branch 'iu.pci-bus-save-load'
authorIan Jackson <iwj@mariner.uk.xensource.com>
Fri, 23 May 2008 17:26:28 +0000 (18:26 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 23 May 2008 17:26:28 +0000 (18:26 +0100)
1  2 
vl.c

diff --cc vl.c
Simple merge