]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 20 Dec 2019 12:46:10 +0000 (12:46 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 20 Dec 2019 12:46:10 +0000 (12:46 +0000)
commit8e5943260a8f765216674ee87ce8588cc4e7463e
treecdafe35ea56d921b7353c4df91cc9e58e7c6cc0d
parent48008198270e3ebcc9394401d676c54ed5ac139c
parent80bc935eaaf93e5b9a4efe97abd7c51d645f2612
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging

Trivial fixes (20191218)

# gpg: Signature made Wed 18 Dec 2019 13:00:34 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  qemu-doc: Remove the unused "Guest Agent" node
  Revert "qemu-options.hx: Update for reboot-timeout parameter"
  target/sparc: Remove old TODO file
  test-keyval: Tighten test of trailing crap after size
  util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON()
  monitor: Remove unused define
  MAINTAINERS: Add hw/sd/ssi-sd.c in the SD section

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
MAINTAINERS
monitor/misc.c
qemu-options.hx