]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-03-12' into...
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 12 Mar 2019 21:06:26 +0000 (21:06 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 12 Mar 2019 21:06:26 +0000 (21:06 +0000)
commit3f3bbfc7cef4490c5ed5550766a81e7d18f08db1
tree27c0667d570a7c1564121cb3cd867bc5f19bcaea
parent9d867123659ac32edd2a0b64cabe2dca544f1d0e
parent390947ed2a7e5e84fa912f275ac20eac48d2f8ca
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-03-12' into staging

- qtest patches
- One SD patch (with Reviewed-by from the maintainer)
- One license fix patch

# gpg: Signature made Tue 12 Mar 2019 09:03:58 GMT
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2019-03-12:
  scripts/qemugdb: re-license timers.py to GPLv2 or later
  hw/sd/sdhci: Move PCI-related code into a separate file
  ahci-test: Drop dependence on global_qtest
  tests: test-announce-self: fix memory leak

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