diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-05-06 21:13:05 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-05-06 21:13:05 +0100 |
| commit | 298d893dd5006a38d0475fb584ae71b9e9f6e161 (patch) | |
| tree | ad4655b4c5eeeff283321e28d1c219e71f58d511 /include/hw/timer/nrf51_timer.h | |
| parent | 570a9214827e3d42f7173c4d4c9f045b99834cf0 (diff) | |
| parent | 541aaa1df80df465c7dc934dc8cf57c0e3dfd6c3 (diff) | |
| download | focaccia-qemu-298d893dd5006a38d0475fb584ae71b9e9f6e161.tar.gz focaccia-qemu-298d893dd5006a38d0475fb584ae71b9e9f6e161.zip | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-05-06-1' into staging
Merge tpm 2020/05/06 v1 # gpg: Signature made Wed 06 May 2020 15:16:17 BST # gpg: using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211 # gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211 * remotes/stefanberger/tags/pull-tpm-2020-05-06-1: hw: add compat machines for 5.1 hw/arm/virt: Remove the compat forcing tpm-tis-device PPI to off tpm: tpm-tis-device: set PPI to false by default Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/timer/nrf51_timer.h')
0 files changed, 0 insertions, 0 deletions