From: Peter Maydell Date: Wed, 26 Nov 2014 12:18:00 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ef4ebcc5c0360629bb05f49d9b961774247d6ca;p=qmiga%2Fqemu.git Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging The final 2.2 patches from me. # gpg: Signature made Wed 26 Nov 2014 11:12:25 GMT using RSA key ID 78C7AE83 # gpg: Good signature from "Paolo Bonzini " # gpg: aka "Paolo Bonzini " # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream: s390x/kvm: Fix compile error fw_cfg: fix boot order bug when dynamically modified via QOM -machine vmport=auto: Fix handling of VMWare ioport emulation for xen Signed-off-by: Peter Maydell --- 3ef4ebcc5c0360629bb05f49d9b961774247d6ca