Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20151123' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 23 Nov 2015 13:54:41 +0000 (13:54 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 23 Nov 2015 13:54:41 +0000 (13:54 +0000)
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>

Trivial merge