| commit | 482d7c0854423608e20e56b5824b7340bd3af7df | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 22 Sep 2015 15:51:36 +0000 (22 16:51 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 22 Sep 2015 15:51:37 +0000 (22 16:51 +0100) | ||
| tree | c035d32bede1323bd40a53aaa39dd4528904f89d | treesnapshot (tar.gz zip) |
| parent | 6138fbdebd72f6822367e88d14ddc635b5a5ddfb | commitdiff |
| parent | abadcbc838a3b256819fd8932c34a4af41ec187f | commitdiff |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-09-22' into staging
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>
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>