From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 2 Mar 2017 19:27:30 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-docs-20170301-1' into staging
X-Git-Tag: qemu-xen-4.10.0-rc1~457
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b49d31a05a1e8f2320bd99ecf84d0bb34c0f3266;p=qemu-xen.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-docs-20170301-1' into staging

docs: update sample configuration files

# gpg: Signature made Wed 01 Mar 2017 13:43:34 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-docs-20170301-1:
  mach-virt: Provide sample configuration files
  q35: Improve sample configuration files

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

b49d31a05a1e8f2320bd99ecf84d0bb34c0f3266