Merge remote-tracking branch 'afaerber/qom-cpu' into staging
commit1ef2a82e8f60779bebdae59f7dad8205cc93db30
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 2 Nov 2012 18:05:38 +0000 (2 13:05 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 2 Nov 2012 18:05:38 +0000 (2 13:05 -0500)
tree6cea1edef0ae229a21fc4031c371a1f82166c969
parent1d8ddda045b4b72dc95a325debb6df0fc19ec821
parente4ab0d6b0d1118a90238d8194eedb91aab15ebe1
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