From: Peter Maydell 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-Url: http://git.maquefel.me/?a=commitdiff_plain;h=68c61282fe8a02aa3bddfa7a9c2b7ad7e6177f69;p=qemu.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 " # gpg: aka "Richard Henderson " # gpg: aka "Richard Henderson " * remotes/rth/tags/pull-tcg-20151123: tcg: Fix highwater check Signed-off-by: Peter Maydell --- 68c61282fe8a02aa3bddfa7a9c2b7ad7e6177f69