summary refs log tree commit diff stats
path: root/hw/timer/lm32_timer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-11-04 22:13:02 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-11-04 22:13:02 +0000
commite2766868d45d8c8f8991cfd133e6a0c14abfe577 (patch)
tree5f083618eae1d4872af84cae14188c4fb02188b6 /hw/timer/lm32_timer.c
parent3c8c36c9087da957f580a9bb5ebf7814a753d1c6 (diff)
parent577b808b0974fa4af53131cdfece6e9de3c6e4fd (diff)
downloadfocaccia-qemu-e2766868d45d8c8f8991cfd133e6a0c14abfe577.tar.gz
focaccia-qemu-e2766868d45d8c8f8991cfd133e6a0c14abfe577.zip
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20201104-pull-request' into staging
misc bugfixes for 5.2

# gpg: Signature made Wed 04 Nov 2020 15:46:33 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/fixes-20201104-pull-request:
  roms/Makefile: Add qboot to .PHONY list
  ati: check x y display parameter values
  vnc: fix resource leak when websocket channel error

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer/lm32_timer.c')
0 files changed, 0 insertions, 0 deletions