diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-11-11 11:05:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-11 11:05:54 +0000 |
| commit | 844741451001cf1aadecde7e5c7b556b8fc4b70b (patch) | |
| tree | 2fa6ea88c1b3544af32b23feab241a87c68fb5f3 | |
| parent | 59c4f2ecefe33878bc23219a51d0bd913d46aa97 (diff) | |
| parent | c0787c8dd1906522c9e760cde5e4f74438d0a911 (diff) | |
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 <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* 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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | MAINTAINERS | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dd02d96624..bcb69e80d2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -880,6 +880,12 @@ S: Maintained F: qobject/ T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp +QEMU Guest Agent +M: Michael Roth <mdroth@linux.vnet.ibm.com> +S: Maintained +F: qga/ +T: git git://github.com/mdroth/qemu.git qga + QOM M: Anthony Liguori <aliguori@amazon.com> M: Andreas Färber <afaerber@suse.de> @@ -920,6 +926,15 @@ M: Blue Swirl <blauwirbel@gmail.com> S: Odd Fixes F: scripts/checkpatch.pl +Migration +M: Juan Quintela <quintela@redhat.com> +S: Maintained +F: include/migration/ +F: migration* +F: savevm.c +F: arch_init.c +F: vmstate.c + Seccomp M: Eduardo Otubo <eduardo.otubo@profitbricks.com> S: Supported @@ -1078,3 +1093,8 @@ M: Chrysostomos Nanakos <cnanakos@grnet.gr> M: Chrysostomos Nanakos <chris@include.gr> S: Maintained F: block/archipelago.c + +Bootdevice +M: Gonglei <arei.gonglei@huawei.com> +S: Maintained +F: bootdevice.c |