Merge branch 'master' of git.qemu.org:/pub/git/qemu
commit4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4
authorBlue Swirl <blauwirbel@gmail.com>
Sun, 7 Oct 2012 18:42:18 +0000 (7 18:42 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sun, 7 Oct 2012 18:42:18 +0000 (7 18:42 +0000)
tree5a5043b1c5c2dd31be2eee9bf8099f90486842db
parent2a484ecf8283814c92b5743845e285f0efc23247
parentf1829782d6cb931973d71649f8ad1dad66188c34
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