From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 2 Nov 2012 18:05:38 +0000 (-0500)
Subject: Merge remote-tracking branch 'afaerber/qom-cpu' into staging
X-Git-Tag: qemu-xen-4.3.0-rc1~105
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1ef2a82e8f60779bebdae59f7dad8205cc93db30;p=qemu-upstream-4.4-testing.git

Merge remote-tracking branch 'afaerber/qom-cpu' into staging

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

* afaerber/qom-cpu:
  target-i386: cpu: fix --disable-kvm compilation
---

1ef2a82e8f60779bebdae59f7dad8205cc93db30