Merge remote-tracking branch 'remotes/kraxel/tags/pull-docs-20170301-1' into staging
commitb49d31a05a1e8f2320bd99ecf84d0bb34c0f3266
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 2 Mar 2017 19:27:30 +0000 (2 19:27 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 2 Mar 2017 19:27:30 +0000 (2 19:27 +0000)
tree9cc7ad89b279813fe551ebd1de0c57700119d41c
parent251501a3714096f807778f6d3f03711dcdb9ce29
parent166d434685ed6da5db88aca0c0599114e0c54462
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>