From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 10 Apr 2012 13:10:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Tag: v2.7.1~5205
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=72fe3aaed94936739abfa158fa28f147b75ae9ff;p=mirror_qemu.git

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

* stefanha/trivial-patches:
  make: fix clean rule by removing build file in qom/
  configure: Link qga against UST tracing related libraries
  configure: Link QEMU against 'liburcu-bp'
  main-loop: make qemu_event_handle static
  block/curl: Replace usleep by g_usleep
  qtest: Add missing GCC_FMT_ATTR
  w32: Undefine error constants before their redefinition
  configure: fix mingw32 libs_qga typo
---

72fe3aaed94936739abfa158fa28f147b75ae9ff