]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 15 Mar 2016 11:05:37 +0000 (11:05 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 15 Mar 2016 11:05:37 +0000 (11:05 +0000)
commitd41e0bed7ba7bad87b4e0cedf5580f29ee1a311f
treea4938c61da8e61ef30c9e0ac4a199e23ade81561
parent9828f9b6c84009ecb07796202317297bdbb8c0ef
parent492a4c94be8853aa378a5dd8a1f8e3181754aabd
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 <ehabkost@redhat.com>"

* 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 <peter.maydell@linaro.org>