]> git.proxmox.com Git - mirror_qemu.git/commit - ui/vnc-clipboard.c
Merge tag 'pull-target-arm-20211122' of https://git.linaro.org/people/pmaydell/qemu...
authorRichard Henderson <richard.henderson@linaro.org>
Mon, 22 Nov 2021 15:35:54 +0000 (16:35 +0100)
committerRichard Henderson <richard.henderson@linaro.org>
Mon, 22 Nov 2021 15:35:54 +0000 (16:35 +0100)
commit89d2f9e4c63799f7f03e9180c63b7dc45fc2a04a
tree878e43227a5c85e84a32c9274d2841339816812b
parent5d1f437fb42dbd520b81a834fb2b7939ec1a7860
parent4825eaae4fdd56fba0febdfbdd7bf9684ae3ee0d
Merge tag 'pull-target-arm-20211122' of https://git.linaro.org/people/pmaydell/qemu-arm into staging

target-arm queue:
 * revert SMCCC/PSCI change, as it regresses some usecases for some boards

# gpg: Signature made Mon 22 Nov 2021 02:42:19 PM CET
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [full]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [full]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [full]

* tag 'pull-target-arm-20211122' of https://git.linaro.org/people/pmaydell/qemu-arm:
  Revert "arm: tcg: Adhere to SMCCC 1.3 section 5.2"

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>