Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20151201' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 2 Dec 2015 10:16:53 +0000 (10:16 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 2 Dec 2015 10:16:53 +0000 (10:16 +0000)
Last minute fix

# gpg: Signature made Tue 01 Dec 2015 22:37:25 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-20151201:
  tcg: Increase the highwater reservation

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

Trivial merge