diff options
| author | Peter Maydell | 2020-09-29 14:18:54 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-09-29 14:18:54 +0200 |
| commit | b150cb8f67bf491a49a1cb1c7da151eeacbdbcc9 (patch) | |
| tree | 0cee7cdb374d62a5716e841c60d3e377a535cada /block/monitor | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200929-pull-request' ... (diff) | |
| parent | tests/acpi: drop unnecessary files (diff) | |
| download | qemu-b150cb8f67bf491a49a1cb1c7da151eeacbdbcc9.tar.gz qemu-b150cb8f67bf491a49a1cb1c7da151eeacbdbcc9.tar.xz qemu-b150cb8f67bf491a49a1cb1c7da151eeacbdbcc9.zip | |
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 <mst@redhat.com>
# 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 <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:
tests/acpi: drop unnecessary files
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/monitor')
0 files changed, 0 insertions, 0 deletions