From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 20 Feb 2017 17:42:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-02-20' into staging
X-Git-Tag: v2.9.0-rc0~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56f9e46b841c7be478ca038d8d4085d776ab4b0d;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-02-20' into staging

QAPI patches for 2017-02-20

# gpg: Signature made Mon 20 Feb 2017 13:31:12 GMT
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2017-02-20:
  Makefile: Put VERSION info into version.texi rather than using -D
  qapi2texi: replace quotation by bold section name

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

56f9e46b841c7be478ca038d8d4085d776ab4b0d