From: Peter Maydell Date: Tue, 15 Mar 2016 11:05:37 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d41e0bed7ba7bad87b4e0cedf5580f29ee1a311f;p=qemu.git Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging X86 fixes # gpg: Signature made Mon 14 Mar 2016 20:26:25 GMT using RSA key ID 984DC5A6 # gpg: Good signature from "Eduardo Habkost " * remotes/ehabkost/tags/x86-pull-request: kvm: Remove x2apic feature from CPU model when kernel_irqchip is off hyperv: cpu hotplug fix with HyperV enabled Signed-off-by: Peter Maydell --- d41e0bed7ba7bad87b4e0cedf5580f29ee1a311f