]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'sstabellini/build_fix' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Apr 2012 14:58:54 +0000 (09:58 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Apr 2012 14:58:54 +0000 (09:58 -0500)
* sstabellini/build_fix:
  xen: add a dummy xc_hvm_inject_msi for Xen < 4.2
  xen,configure: detect Xen 4.2

1  2 
configure

diff --cc configure
Simple merge