aboutsummaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-08-04 13:53:38 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-08-04 13:53:38 +0100
commitf17d05569a5443691edd823f65c2d833a3598ae6 (patch)
treebcad7a2affc431168f3625f769f57a2297d9fbaf /VERSION
parent700d82c9bc6c1c53d5f501fc2d099d28da0cef7a (diff)
parent62a4db5522cbbd8b5309a2949c22f00e5b0138e3 (diff)
downloadqemu-f17d05569a5443691edd823f65c2d833a3598ae6.zip
qemu-f17d05569a5443691edd823f65c2d833a3598ae6.tar.gz
qemu-f17d05569a5443691edd823f65c2d833a3598ae6.tar.bz2
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc,pci: bugfixes Small bugfixes all over the place. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Tue 03 Aug 2021 21:32:43 BST # gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469 # gpg: issuer "mst@redhat.com" # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full] # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full] # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: Drop _DSM 5 from expected DSDTs on ARM Revert "acpi/gpex: Inform os to keep firmware resource map" arm/acpi: allow DSDT changes acpi: x86: pcihp: add support hotplug on multifunction bridges hw/pcie-root-port: Fix hotplug for PCI devices requiring IO Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions