diff options
| author | Peter Maydell | 2018-11-26 14:58:46 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-11-26 14:58:46 +0100 |
| commit | d522fba24478474911b0e6e488b6d1dcf1af54f8 (patch) | |
| tree | 830b9086c58861d08881206b775ee755bdbfe929 /hw/arm/virt.c | |
| parent | Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (diff) | |
| parent | net: cadence_gem: Remove incorrect assert() (diff) | |
| download | qemu-d522fba24478474911b0e6e488b6d1dcf1af54f8.tar.gz qemu-d522fba24478474911b0e6e488b6d1dcf1af54f8.tar.xz qemu-d522fba24478474911b0e6e488b6d1dcf1af54f8.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20181126' into staging
target-arm queue:
* some updates to MAINTAINERS file entries
* cadence_gem: Remove an incorrect assert()
# gpg: Signature made Mon 26 Nov 2018 13:57:34 GMT
# gpg: using RSA key 3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE
* remotes/pmaydell/tags/pull-target-arm-20181126:
net: cadence_gem: Remove incorrect assert()
MAINTAINERS: Add an ARM SMMU section
MAINTAINERS: Assign some more files in the hw/arm/ directory
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/virt.c')
0 files changed, 0 insertions, 0 deletions