Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8eb80ea177a0e30e03a6d75890b0fcdff0a7c014..b45f0750b288f384c518fddd88c4ecc415c98045 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -78,7 +78,7 @@ F: target-lm32/
 
 M68K
 M: Paul Brook <[email protected]>
-S: Maintained
+S: Odd Fixes
 F: target-m68k/
 
 MicroBlaze
@@ -88,7 +88,7 @@ F: target-microblaze/
 
 MIPS
 M: Aurelien Jarno <[email protected]>
-S: Maintained
+S: Odd Fixes
 F: target-mips/
 
 PowerPC
@@ -104,7 +104,7 @@ F: target-s390x/
 
 SH4
 M: Aurelien Jarno <[email protected]>
-S: Maintained
+S: Odd Fixes
 F: target-sh4/
 
 SPARC
@@ -112,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
@@ -251,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
@@ -387,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
 ---------------
@@ -420,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]>
@@ -444,9 +462,9 @@ F: hw/virtio*
 virtio-9p
 M: Aneesh Kumar K.V <[email protected]>
 S: Supported
-F: hw/9pfs/ fsdev/
-T: https://github.com/kvaneesh/QEMU
-
+F: hw/9pfs/
+F: fsdev/
+T: git git://github.com/kvaneesh/QEMU.git
 
 virtio-blk
 M: Kevin Wolf <[email protected]>
@@ -524,18 +542,22 @@ 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://github.com/stefanha/qemu.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]>
@@ -549,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
@@ -615,4 +632,26 @@ F: tcg/sparc/
 TCI target
 M: Stefan Weil <[email protected]>
 S: Maintained
-F: tcg/tci
+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