summary refs log tree commit diff stats
path: root/hw/timer/imx_epit.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-10-15 10:55:38 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-10-15 10:55:38 +0100
commit3779d1801166cc27b91f88366dd5bbae6b1c6dde (patch)
treeff205fb4a6f9318accca54c14e2516400391d430 /hw/timer/imx_epit.c
parent4a512a95bbca8f47b76bffd9c59b7d28297d86e1 (diff)
parent69de48445a0d6169f1e2a6c5bfab994e1c810e33 (diff)
downloadfocaccia-qemu-3779d1801166cc27b91f88366dd5bbae6b1c6dde.tar.gz
focaccia-qemu-3779d1801166cc27b91f88366dd5bbae6b1c6dde.zip
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request

# gpg: Signature made Mon 14 Oct 2019 09:52:03 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  test-bdrv-drain: fix iothread_join() hang

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