summary refs log tree commit diff stats
path: root/hw/timer/grlib_gptimer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-03-14 18:17:25 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-03-14 18:17:25 +0000
commit03d51428e2da0188a0adea00cbd713cc1e967e7a (patch)
tree371bbd515032a5422f8580c0f1cd7f624b0f5c88 /hw/timer/grlib_gptimer.c
parent5d92c74f8a1728a202ba9457872ab0f27ff15e81 (diff)
parentaa7a6a399f8253d3831465b1db8544032b49f57a (diff)
downloadfocaccia-qemu-03d51428e2da0188a0adea00cbd713cc1e967e7a.tar.gz
focaccia-qemu-03d51428e2da0188a0adea00cbd713cc1e967e7a.zip
Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
* remotes/bonzini/scsi-next:
  virtio-scsi: actually honor sense_size from configuration space
  scsi: Fix migration of scsi sense data
  spapr-vscsi: fix CRQ status

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