diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-05-31 20:43:45 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-05-31 20:43:45 +0100 |
| commit | 4ec2a1f53e8aaa22924614b64dde97321126943e (patch) | |
| tree | 0e85bf340ac0e441c84ef6c5737a1517de5d700e /hw/adc/stm32f2xx_adc.c | |
| parent | ce20db593f50752badbc94d6a96e4576aa4a2443 (diff) | |
| parent | b809667808b1f742a85d6cce0d77800be20bcaa0 (diff) | |
| download | focaccia-qemu-4ec2a1f53e8aaa22924614b64dde97321126943e.tar.gz focaccia-qemu-4ec2a1f53e8aaa22924614b64dde97321126943e.zip | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-05-30' into staging
- Replace hw_error() with qemu_log_mask() in the m68k coldfire machine code # gpg: Signature made Sat 30 May 2020 08:44:41 BST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "huth@tuxfamily.org" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/huth-gitlab/tags/pull-request-2020-05-30: hw/m68k/mcf52xx: Replace hw_error() by qemu_log_mask() hw/m68k/mcf5206: Reduce m5206_mbar_read/write() offset arg to 16-bit Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/adc/stm32f2xx_adc.c')
0 files changed, 0 insertions, 0 deletions