]> xenbits.xensource.com Git - qemu-xen-3.3-testing.git/commitdiff
projects / qemu-xen-3.3-testing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6425a1 ef36c5e)
Merge branch 'qemu'
authorIan Jackson <ian.jackson@eu.citrix.com>
Fri, 1 Aug 2008 16:16:58 +0000 (17:16 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 1 Aug 2008 16:16:58 +0000 (17:16 +0100)
1  2 
hw/ide.c patch | diff1 | diff2 | blob | history

diff --cc hw/ide.c
Simple merge
Obsolete Qemu-dm 3.3 stable branch