From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 26 Nov 2018 13:58:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20181126' into... 
X-Git-Tag: v3.1.0-rc3~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d522fba24478474911b0e6e488b6d1dcf1af54f8;p=thirdparty%2Fqemu.git

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>
---

d522fba24478474911b0e6e488b6d1dcf1af54f8