]> xenbits.xensource.com Git - qemu-upstream-unstable.git/commitdiff
Merge remote-tracking branch 'origin/stable-2.2' into xen-staging/master
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Wed, 11 Mar 2015 11:16:38 +0000 (11:16 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Wed, 11 Mar 2015 11:16:38 +0000 (11:16 +0000)
1  2 
hw/core/qdev.c

diff --cc hw/core/qdev.c
Simple merge