From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 23 Nov 2015 13:54:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20151123' into staging
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~121^2~1^2~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=68c61282fe8a02aa3bddfa7a9c2b7ad7e6177f69;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20151123' into staging

Last minute fix.

# gpg: Signature made Mon 23 Nov 2015 12:17:26 GMT using RSA key ID 4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@redhat.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"

* remotes/rth/tags/pull-tcg-20151123:
  tcg: Fix highwater check

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

68c61282fe8a02aa3bddfa7a9c2b7ad7e6177f69