diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-12 21:06:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-12 21:06:26 +0000 |
| commit | 3f3bbfc7cef4490c5ed5550766a81e7d18f08db1 (patch) | |
| tree | 27c0667d570a7c1564121cb3cd867bc5f19bcaea /scripts | |
| parent | 9d867123659ac32edd2a0b64cabe2dca544f1d0e (diff) | |
| parent | 390947ed2a7e5e84fa912f275ac20eac48d2f8ca (diff) | |
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qemugdb/timers.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/qemugdb/timers.py b/scripts/qemugdb/timers.py index 51ea04b5e2..f0e132d27a 100644 --- a/scripts/qemugdb/timers.py +++ b/scripts/qemugdb/timers.py @@ -6,8 +6,10 @@ # # Author: Alex Bennée <alex.bennee@linaro.org> # -# This work is licensed under the terms of the GNU GPL, version 2. See -# the COPYING file in the top-level directory. +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# +# SPDX-License-Identifier: GPL-2.0-or-later # 'qemu timers' -- display the current timerlists |