projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6138fbd abadcbc)
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-09-22' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 22 Sep 2015 15:51:36 +0000 (16:51 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 22 Sep 2015 15:51:37 +0000 (16:51 +0100)
Monitor patches

# gpg: Signature made Tue 22 Sep 2015 10:33:34 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-monitor-2015-09-22:
  hmp: Restore "info pci"
  monitor: allow device_del to accept QOM paths

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

Trivial merge
Domain: SDK / Emulator;