summary refs log tree commit diff stats
path: root/hw/timer/slavio_timer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-02-26 22:31:10 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-02-26 22:31:10 +0000
commit6f6831f61a44fde832ee6fab0cc5632de34cf6b7 (patch)
tree47e59106156748bef6ef87537ad230ae7bec6044 /hw/timer/slavio_timer.c
parentbc3fbad816961a5b4a7f51a37472c4ac01effb92 (diff)
parent41310c68781d742fa9bbfd5fcb1df9b7f23f5759 (diff)
downloadfocaccia-qemu-6f6831f61a44fde832ee6fab0cc5632de34cf6b7.tar.gz
focaccia-qemu-6f6831f61a44fde832ee6fab0cc5632de34cf6b7.zip
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140225' into staging
migration/next for 20140225

# gpg: Signature made Tue 25 Feb 2014 14:04:31 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20140225:
  rdma: rename 'x-rdma' => 'rdma'
  Fix two XBZRLE corruption issues
  Fix vmstate_info_int32_le comparison/assign
  qemu_file: use fwrite() correctly

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