diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-30 20:53:26 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-30 20:53:26 +0100 |
| commit | 4366e7cfb4486cfe3e2947f3b0276082c2b43a90 (patch) | |
| tree | deab21f31b3e973a7d2e34fd8b8148cfc38484a3 /include/ui/gtk.h | |
| parent | 987a23224218fa3bb3aa0024ad236dcf29ebde9e (diff) | |
| parent | c8557f1b4873549fc231496f00003a9e5389c8dd (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pci: bugfix
A last minute fix to cross-version migration.
Better late than never.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 30 Jul 2019 17:07:42 BST
# gpg: using RSA key 281F0DB8D28D5469
# 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:
pcie_root_port: Disable ACS on older machines
pcie_root_port: Allow ACS to be disabled
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui/gtk.h')
0 files changed, 0 insertions, 0 deletions