From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 7 Oct 2012 18:42:18 +0000 (+0000)
Subject: Merge branch 'master' of git.qemu.org:/pub/git/qemu
X-Git-Tag: v1.3.0-rc0~316
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4;p=qemu.git

Merge branch 'master' of git.qemu.org:/pub/git/qemu

* 'master' of git.qemu.org:/pub/git/qemu:
  qemu-barrier: Fix compilation on i386 hosts
---

4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4