Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170314' into...
commit486fc7a837ccbe00f78bdaafc32dbe0235a7883d
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 14 Mar 2017 14:11:38 +0000 (14 14:11 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 14 Mar 2017 14:11:38 +0000 (14 14:11 +0000)
tree1694e26e896d42a60a30aca6f818ff1020fb61b5
parent591bce29b10a957a5cad4354cd5959c45570aedb
parentd5affb0d8677e1a8a8fe03fa25005b669e7cdc02
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170314' into staging

target-arm queue:
 * arm-powerctl: Fix psci info return values
 * implement armv8 PMUSERENR (user-mode enable bits)

# gpg: Signature made Tue 14 Mar 2017 11:31:11 GMT
# gpg:                using RSA key 0x3C2525ED14360CDE
# 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-20170314:
  target/arm/arm-powerctl: Fix psci info return values
  target/arm: implement armv8 PMUSERENR (user-mode enable bits)

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