]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 16 Aug 2016 12:03:15 +0000 (13:03 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 16 Aug 2016 12:03:16 +0000 (13:03 +0100)
target-i386: kernel_irqchip=off fix for KVM

# gpg: Signature made Tue 16 Aug 2016 12:55:42 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-pull-request:
  target-i386: kvm: Report kvm_pv_unhalt as unsupported w/o kernel_irqchip

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge