tree 3f9c556b4feb377938095ba8e92d563d9234754c
parent f2bdbd5bb4b7869ea48845d5a92979290df6f195
parent 09a021fb7ceb7255ab106999d7b38ffd92c3bdd6
author Anthony Liguori <aliguori@us.ibm.com> 1358775142 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1358775142 -0600

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