Commit 84474145 authored by Peter Maydell's avatar Peter Maydell

Merge remote-tracking branch 'remotes/armbru/tags/for-upstream' into staging

Patches to MAINTAINERS that haven't been picked up

# gpg: Signature made Tue 11 Nov 2014 08:46:55 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <>"
# gpg:                 aka "Markus Armbruster <>"

* remotes/armbru/tags/for-upstream:
  Add Migration maintainer
  MAINTAINERS: add section for QEMU Guest Agent
  MAINTAINERS: add myself as bootdevice.c maintainer
Signed-off-by: default avatarPeter Maydell <>
parents 59c4f2ec c0787c8d
......@@ -880,6 +880,12 @@ S: Maintained
F: qobject/
T: git git:// queue/qmp
QEMU Guest Agent
M: Michael Roth <>
S: Maintained
F: qga/
T: git git:// qga
M: Anthony Liguori <>
M: Andreas Färber <>
......@@ -920,6 +926,15 @@ M: Blue Swirl <>
S: Odd Fixes
F: scripts/
M: Juan Quintela <>
S: Maintained
F: include/migration/
F: migration*
F: savevm.c
F: arch_init.c
F: vmstate.c
M: Eduardo Otubo <>
S: Supported
......@@ -1078,3 +1093,8 @@ M: Chrysostomos Nanakos <>
M: Chrysostomos Nanakos <>
S: Maintained
F: block/archipelago.c
M: Gonglei <>
S: Maintained
F: bootdevice.c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment