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>2019-07-04 10:28:25 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-07-04 10:28:25 +0100
commitb2e1bc59f0f1ce0fd3962757ec4a334363b37f47 (patch)
tree741c86785520741d43de580233a00176b53f642c /hw/timer/lm32_timer.c
parentf0577c616cde85f8bc06da2b2db705ca2fffae49 (diff)
parent09340f497e96a62d076b2f223e7b16a7358cfecb (diff)
downloadfocaccia-qemu-b2e1bc59f0f1ce0fd3962757ec4a334363b37f47.tar.gz
focaccia-qemu-b2e1bc59f0f1ce0fd3962757ec4a334363b37f47.zip
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20190702' into staging
qemu-sparc queue

# gpg: Signature made Tue 02 Jul 2019 23:14:13 BST
# gpg:                using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg:                issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" [full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc-20190702:
  sunhme: ensure that RX descriptor ring overflow is indicated to client driver
  sunhme: fix return values from sunhme_receive() during receive packet processing
  sunhme: flush any queued packets when HME_MAC_RXCFG_ENABLE bit is raised
  sunhme: fix incorrect constant in sunhme_can_receive()
  sunhme: add trace event for logging PCI IRQ
  sun4m: set default display type to TCX

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