summary refs log tree commit diff stats
path: root/hw/timer/stm32f2xx_timer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-09-30 00:42:08 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-09-30 00:42:08 +0100
commit49540a1f652afd419812bd4d35cc6f45a46a2afe (patch)
tree87080c9a77b495a04c86400197251d2cdd912f02 /hw/timer/stm32f2xx_timer.c
parentcc9a366d3b161d255fcf25aad30e0c8fcc766013 (diff)
parentca44141d5fb801dd5903102acefd0f2d8e8bb6a1 (diff)
downloadfocaccia-qemu-49540a1f652afd419812bd4d35cc6f45a46a2afe.tar.gz
focaccia-qemu-49540a1f652afd419812bd4d35cc6f45a46a2afe.zip
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Thu 29 Sep 2016 21:13:46 BST
# gpg:                using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  ide: Fix memory leak in ide_register_restart_cb()
  MAINTAINERS: Add some more headers to the IDE section
  ahci: clear aiocb in ncq_cb
  ide: fix DMA register transitions

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