tree 6cea1edef0ae229a21fc4031c371a1f82166c969
parent 1d8ddda045b4b72dc95a325debb6df0fc19ec821
parent e4ab0d6b0d1118a90238d8194eedb91aab15ebe1
author Anthony Liguori <aliguori@us.ibm.com> 1351879538 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1351879538 -0500

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