From: Peter Maydell Date: Tue, 29 Sep 2020 12:18:54 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Tag: pull-nvme-20201102~82 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b150cb8f67bf491a49a1cb1c7da151eeacbdbcc9;p=qemu-nvme.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging acpi: fixup My last pull included a ton of useless files by mistake. Drop them all. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Tue 29 Sep 2020 12:12:20 BST # gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469 # gpg: issuer "mst@redhat.com" # gpg: Good signature from "Michael S. Tsirkin " [full] # gpg: aka "Michael S. Tsirkin " [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: tests/acpi: drop unnecessary files Signed-off-by: Peter Maydell --- b150cb8f67bf491a49a1cb1c7da151eeacbdbcc9