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>2016-06-13 12:18:17 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-06-13 12:18:17 +0100
commit8fdf038722a00693e68b4f76a66d39781572c3ec (patch)
treeff10c2adca12a51dda06fa5ace47f8eaa816f250 /hw/timer/lm32_timer.c
parentda2fdd0bd1514a44309dd5be162ebfb6c166a716 (diff)
parent88c16567d2cd23da328787187910b013ee43ebca (diff)
downloadfocaccia-qemu-8fdf038722a00693e68b4f76a66d39781572c3ec.tar.gz
focaccia-qemu-8fdf038722a00693e68b4f76a66d39781572c3ec.zip
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160613-tag' into staging
Xen 2016/06/13

# gpg: Signature made Mon 13 Jun 2016 11:53:18 BST
# gpg:                using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90

* remotes/sstabellini/tags/xen-20160613-tag:
  Introduce "xen-load-devices-state"
  exec: Fix qemu_ram_block_from_host for Xen

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