]> git.ipfire.org Git - thirdparty/qemu.git/commit - hw/misc/applesmc.c
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2020-11-16-tag' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 16 Nov 2020 20:15:57 +0000 (20:15 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 16 Nov 2020 20:15:57 +0000 (20:15 +0000)
commitb17d3b7b77f043f0e76f0e6ce6def3c1b1d5ee8b
treead3322bff8fa2ec8c400111a3e4def23e100efc7
parentcb5ed407a1ddadf788fd373fed41c87c9e81e5b0
parenta8aa94b5f8427cc2924d8cdd417c8014db1c86c0
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2020-11-16-tag' into staging

qemu-ga patch queue for hard-freeze

* fixes for schema data-type declarations for guest-get-disks

# gpg: Signature made Mon 16 Nov 2020 19:18:12 GMT
# gpg:                using RSA key CEACC9E15534EBABB82D3FA03353C9CEF108B584
# gpg:                issuer "michael.roth@amd.com"
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>" [full]
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>" [full]
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>" [full]
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D  3FA0 3353 C9CE F108 B584

* remotes/mdroth/tags/qga-pull-2020-11-16-tag:
  qga: update schema for guest-get-disks 'dependents' field

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