Merge remote-tracking branch 'afaerber/qom-cpu' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 2 Nov 2012 18:05:38 +0000 (13:05 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 2 Nov 2012 18:05:38 +0000 (13:05 -0500)
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* afaerber/qom-cpu:
  target-i386: cpu: fix --disable-kvm compilation


Trivial merge