From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 18 Jun 2014 14:08:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/bonzini/memory' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2edaf21b939eb3b7f058fbc3cb7f7e14d6262486;p=qemu.git

Merge remote-tracking branch 'remotes/bonzini/memory' into staging

* remotes/bonzini/memory:
  memory: Don't call memory_region_update_coalesced_range if nothing changed
  memory: MemoryRegion: rename parent to container
  memory: MemoryRegion: factor out memory region re-adder
  memory: MemoryRegion: factor out subregion add functionality
  qtest: fix qtest_clock_warp() for no deadline case
  exec: dummy_section: Pass address space through.
  memory: Simplify mr_add_subregion() if-else
  memory: Don't update all memory region when ioeventfd changed
  unset RAMBlock idstr when unregister MemoryRegion
  exec: introduce qemu_ram_unset_idstr() to unset RAMBlock idstr
  MAINTAINERS: Add myself as Memory API maintainer

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

2edaf21b939eb3b7f058fbc3cb7f7e14d6262486