]> xenbits.xensource.com Git - qemu-upstream-4.4-testing.git/commitdiff
projects / qemu-upstream-4.4-testing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e381cca 62ecc3a)
Merge remote branch 'origin/stable-1.6' into xen-staging-master-9
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Thu, 10 Oct 2013 11:02:48 +0000 (11:02 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Thu, 10 Oct 2013 11:02:48 +0000 (11:02 +0000)
Conflicts:
xen-all.c

1  2 
xen-all.c patch | diff1 | diff2 | blob | history

diff --cc xen-all.c
Simple merge
Obsolete Upstream Qemu based repository for xen-4.4-testing