]> xenbits.xensource.com Git - qemu-xen-4.5-testing.git/commitdiff
Merge branch 'master' into xen
authorIan Jackson <iwj@mariner.uk.xensource.com>
Tue, 27 May 2008 13:46:08 +0000 (14:46 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 27 May 2008 13:46:08 +0000 (14:46 +0100)
1  2 
osdep.c

diff --cc osdep.c
Simple merge