From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 21 Jan 2013 13:32:22 +0000 (-0600)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Tag: v1.4.0-rc0~127
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e0f01837e104517c7c511c79bb93c8792b7263e5;p=qemu.git

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

# By Stefan Weil (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  hw/tpci200: Fix compiler warning (redefined symbol with MinGW)
  configure: silence pkg-config's check for curses
  acpitable: open the data file in binary mode
  hw: Spelling fix in log message
---

e0f01837e104517c7c511c79bb93c8792b7263e5