Merge branch 'maintainers-up' of git://repo.or.cz/qemu/afaerber

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4535eeb61f9c9ff53fb533050ae0e16f0bdee6f9..b45f0750b288f384c518fddd88c4ecc415c98045 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20,7 +20,7 @@ Descriptions of section entries:
           Supported:   Someone is actually paid to look after this.
           Maintained:  Someone actually looks after it.
           Odd Fixes:   It has a maintainer but they don't have time to do
-                       much other than throw the odd patch in. See below..
+                       much other than throw the odd patch in. See below.
           Orphan:      No current maintainer [but maybe you could take the
                        role as you write your new code].
           Obsolete:    Old code. Something tagged obsolete generally means
@@ -78,7 +78,7 @@ F: target-lm32/
 
 M68K
 M: Paul Brook <[email protected]>
-S: Maintained
+S: Odd Fixes
 F: target-m68k/
 
 MicroBlaze
@@ -88,11 +88,12 @@ F: target-microblaze/
 
 MIPS
 M: Aurelien Jarno <[email protected]>
-S: Maintained
+S: Odd Fixes
 F: target-mips/
 
 PowerPC
 M: Alexander Graf <[email protected]>
+L: [email protected]
 S: Maintained
 F: target-ppc/
 
@@ -103,7 +104,7 @@ F: target-s390x/
 
 SH4
 M: Aurelien Jarno <[email protected]>
-S: Maintained
+S: Odd Fixes
 F: target-sh4/
 
 SPARC
@@ -111,6 +112,11 @@ M: Blue Swirl <[email protected]>
 S: Maintained
 F: target-sparc/
 
+UniCore32
+M: Guan Xuetao <[email protected]>
+S: Maintained
+F: target-unicore32/
+
 X86
 M: [email protected]
 S: Odd Fixes
@@ -160,8 +166,42 @@ S: Supported
 F: xen-*
 F: */xen*
 
+Hosts:
+------
+
+LINUX
+L: [email protected]
+S: Maintained
+F: linux-*
+F: linux-headers/
+
+POSIX
+L: [email protected]
+S: Maintained
+F: *posix*
+
+W32, W64
+L: [email protected]
+M: Stefan Weil <[email protected]>
+S: Maintained
+F: *win32*
+
 ARM Machines
 ------------
+Exynos
+M: Evgeny Voevodin <[email protected]>
+M: Maksim Kozlov <[email protected]>
+M: Igor Mitsyanko <[email protected]>
+M: Dmitry Solodkiy <[email protected]>
+S: Maintained
+F: hw/exynos*
+
+Calxeda Highbank
+M: Mark Langsdorf <[email protected]>
+S: Supported
+F: hw/highbank.c
+F: hw/xgmac.c
+
 Gumstix
 M: [email protected]
 S: Orphan
@@ -216,6 +256,13 @@ M: Peter Maydell <[email protected]>
 S: Maintained
 F: hw/versatilepb.c
 
+Xilinx Zynq
+M: Peter Crosthwaite <[email protected]>
+S: Maintained
+F: hw/xilinx_zynq.c
+F: hw/zynq_slcr.c
+F: hw/cadence_*
+
 CRIS Machines
 -------------
 Axis Dev88
@@ -290,23 +337,31 @@ PowerPC Machines
 ----------------
 405
 M: Alexander Graf <[email protected]>
+L: [email protected]
 S: Maintained
 F: hw/ppc405_boards.c
 
 New World
 M: Alexander Graf <[email protected]>
+L: [email protected]
 S: Maintained
 F: hw/ppc_newworld.c
+F: hw/unin_pci.c
+F: hw/dec_pci.[hc]
 
 Old World
 M: Alexander Graf <[email protected]>
+L: [email protected]
 S: Maintained
 F: hw/ppc_oldworld.c
+F: hw/grackle_pci.c
 
-Prep
-M: [email protected]
-S: Orphan
+PReP
+M: Andreas Färber <[email protected]>
+L: [email protected]
+S: Odd Fixes
 F: hw/ppc_prep.c
+F: hw/prep_pci.[hc]
 
 SH4 Machines
 ------------
@@ -344,7 +399,8 @@ X86 Machines
 PC
 M: Anthony Liguori <[email protected]>
 S: Supported
-F: hw/pc.[ch] hw/pc_piix.c
+F: hw/pc.[ch]
+F: hw/pc_piix.c
 
 Xtensa Machines
 ---------------
@@ -377,11 +433,16 @@ F: hw/pci*
 F: hw/piix*
 
 SCSI
+M: Paolo Bonzini <[email protected]>
+S: Supported
+F: hw/virtio-scsi.*
+F: hw/scsi*
+T: git git://github.com/bonzini/qemu.git scsi-next
+
+LSI53C895A
 M: Paul Brook <[email protected]>
-M: Kevin Wolf <[email protected]>
 S: Odd Fixes
 F: hw/lsi53c895a.c
-F: hw/scsi*
 
 USB
 M: Gerd Hoffmann <[email protected]>
@@ -399,9 +460,11 @@ S: Supported
 F: hw/virtio*
 
 virtio-9p
-M: Venkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com>
+M: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
 S: Supported
-F: hw/virtio-9p*
+F: hw/9pfs/
+F: fsdev/
+T: git git://github.com/kvaneesh/QEMU.git
 
 virtio-blk
 M: Kevin Wolf <[email protected]>
@@ -451,6 +514,11 @@ M: Anthony Liguori <[email protected]>
 S: Maintained
 F: ui/
 
+Cocoa graphics
+M: Andreas Färber <[email protected]>
+S: Odd Fixes
+F: ui/cocoa.m
+
 Main loop
 M: Anthony Liguori <[email protected]>
 S: Supported
@@ -468,17 +536,33 @@ M: Mark McLoughlin <[email protected]>
 S: Maintained
 F: net/
 
+Network Block Device (NBD)
+M: Paolo Bonzini <[email protected]>
+S: Odd Fixes
+F: block/nbd.c
+F: nbd.*
+F: qemu-nbd.c
+T: git git://github.com/bonzini/qemu.git nbd-next
+
 SLIRP
 M: Jan Kiszka <[email protected]>
 S: Maintained
 F: slirp/
-T: git://git.kiszka.org/qemu.git queues/slirp
+T: git git://git.kiszka.org/qemu.git queues/slirp
 
 Tracing
 M: Stefan Hajnoczi <[email protected]>
 S: Maintained
 F: trace/
-T: git://repo.or.cz/qemu/stefanha.git tracing
+F: scripts/tracetool.py
+F: scripts/tracetool/
+F: docs/tracing.txt
+T: git git://github.com/stefanha/qemu.git tracing
+
+Checkpatch
+M: Blue Swirl <[email protected]>
+S: Odd Fixes
+F: scripts/checkpatch.pl
 
 Usermode Emulation
 ------------------
@@ -487,11 +571,6 @@ M: Blue Swirl <[email protected]>
 S: Maintained
 F: bsd-user/
 
-Darwin user
-M: [email protected]
-S: Orphan
-F: darwin-user/
-
 Linux user
 M: Riku Voipio <[email protected]>
 S: Maintained
@@ -549,3 +628,30 @@ SPARC target
 M: Blue Swirl <[email protected]>
 S: Maintained
 F: tcg/sparc/
+
+TCI target
+M: Stefan Weil <[email protected]>
+S: Maintained
+F: tcg/tci/
+
+Stable branches
+---------------
+Stable 1.0
+L: [email protected]
+T: git git://git.qemu.org/qemu-stable-1.0.git
+S: Orphan
+
+Stable 0.15
+L: [email protected]
+T: git git://git.qemu.org/qemu-stable-0.15.git
+S: Orphan
+
+Stable 0.14
+L: [email protected]
+T: git git://git.qemu.org/qemu-stable-0.14.git
+S: Orphan
+
+Stable 0.10
+L: [email protected]
+T: git git://git.qemu.org/qemu-stable-0.10.git
+S: Orphan