From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 30 Nov 2015 15:35:20 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20151130' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=680617ed43a2811318ac2df63e686f6b7bc22f55;p=qemu.git

Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20151130' into staging

wxx patch queue

# gpg: Signature made Mon 30 Nov 2015 05:48:33 GMT using RSA key ID 677450AD
# gpg: Good signature from "Stefan Weil <sw@weilnetz.de>"
# gpg:                 aka "Stefan Weil <stefan.weil@weilnetz.de>"
# gpg:                 aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD

* remotes/weil/tags/pull-wxx-20151130:
  w32: Use gcc option -mthreads
  oslib-win32: Change return type of function getpagesize
  trace/simple: Fix warning and wrong trace file name for MinGW

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

680617ed43a2811318ac2df63e686f6b7bc22f55