diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-22 16:51:36 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-22 16:51:37 +0100 |
| commit | 482d7c0854423608e20e56b5824b7340bd3af7df (patch) | |
| tree | c035d32bede1323bd40a53aaa39dd4528904f89d /pc-bios/pxe-ne2k_pci.rom | |
| parent | 6138fbdebd72f6822367e88d14ddc635b5a5ddfb (diff) | |
| parent | abadcbc838a3b256819fd8932c34a4af41ec187f (diff) | |
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>
Diffstat (limited to 'pc-bios/pxe-ne2k_pci.rom')
0 files changed, 0 insertions, 0 deletions