diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-26 12:41:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-26 12:41:12 +0100 |
| commit | 0533d3de606a74f1b3030e9ecc8f9f2d9b7cb463 (patch) | |
| tree | c811c9f833c2a7598b6f81383772d2d42391be44 | |
| parent | 287db79df8af8e31f18e262feb5e05103a09e4d4 (diff) | |
| parent | 12b0e69cd71f3f71bacb51ed7dc71393ec384da6 (diff) | |
Merge remote-tracking branch 'remotes/afaerber/tags/maintainers-for-peter' into staging
Andreas stepping down from most maintainer positions
# gpg: Signature made Wed 25 May 2016 16:53:45 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/maintainers-for-peter:
MAINTAINERS: Drop Andreas as CPU maintainer
MAINTAINERS: Drop Andreas as 0.15 maintainer
MAINTAINERS: Drop Andreas as PReP maintainer
MAINTAINERS: Drop Andreas as Cocoa maintainer
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 81e7fac2fc..3700d51c0b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -597,7 +597,7 @@ F: hw/pci-host/grackle.c F: hw/misc/macio/ PReP -M: Andreas Färber <andreas.faerber@web.de> +L: qemu-devel@nongnu.org L: qemu-ppc@nongnu.org S: Odd Fixes F: hw/ppc/prep.c @@ -1046,7 +1046,7 @@ S: Supported F: scripts/coverity-model.c CPU -M: Andreas Färber <afaerber@suse.de> +L: qemu-devel@nongnu.org S: Supported F: qom/cpu.c F: include/qom/cpu.h @@ -1105,7 +1105,6 @@ F: ui/ F: include/ui/ Cocoa graphics -M: Andreas Färber <andreas.faerber@web.de> M: Peter Maydell <peter.maydell@linaro.org> S: Odd Fixes F: ui/cocoa.m @@ -1400,9 +1399,8 @@ S: Orphan Stable 0.15 L: qemu-stable@nongnu.org -M: Andreas Färber <afaerber@suse.de> T: git git://git.qemu-project.org/qemu-stable-0.15.git -S: Supported +S: Orphan Stable 0.14 L: qemu-stable@nongnu.org |