]> xenbits.xensource.com Git - qemu-xen-3.3-testing.git/commitdiff
Merge branch 'qemu'
authorIan Jackson <iwj@mariner.uk.xensource.com>
Tue, 15 Jul 2008 16:36:58 +0000 (17:36 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 15 Jul 2008 16:36:58 +0000 (17:36 +0100)
1  2 
vl.c

diff --cc vl.c
Simple merge