summary refs log tree commit diff stats
path: root/hw/timer/omap_gptimer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-07-01 11:55:48 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-07-01 11:55:49 +0100
commitc26f3a0a6dfe5ef2973ddfab03b1ceff641a7ebe (patch)
tree286413832e3d84d7d1cf3fd4d1093f2c48e87f7d /hw/timer/omap_gptimer.c
parentb3959efdbb2dc3d5959e3b0a8e188126930beca8 (diff)
parent352e8da743f26948cb12d0ee53c455f328f59bbe (diff)
downloadfocaccia-qemu-c26f3a0a6dfe5ef2973ddfab03b1ceff641a7ebe.tar.gz
focaccia-qemu-c26f3a0a6dfe5ef2973ddfab03b1ceff641a7ebe.zip
Merge remote-tracking branch 'remotes/bonzini/memory' into staging
* remotes/bonzini/memory:
  qdev: correctly send DEVICE_DELETED for recursively-deleted devices
  memory: do not give a name to the internal exec.c regions
  memory: MemoryRegion: Add size property
  memory: MemoryRegion: Add may-overlap and priority props
  memory: MemoryRegion: Add container and addr props
  memory: MemoryRegion: replace owner field with QOM parent
  memory: MemoryRegion: QOMify
  memory: MemoryRegion: use /machine as default owner
  libqtest: escape strings in QMP commands, fix leak
  qom: object: Ignore refs/unrefs of NULL
  qom: object: remove parent pointer when unparenting
  mc146818rtc: add "rtc-time" link to "/machine/rtc"
  qom: allow creating an alias of a child<> property
  qom: add a generic mechanism to resolve paths
  qom: add object_property_add_alias()

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