diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-05-01 09:29:44 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-05-01 09:29:44 +0000 |
| commit | e09db789abfeb94f431afe8e89481ac23ff4ea79 (patch) | |
| tree | 225ea28868d4cb05bd4543fddbececa4ad5f9401 | |
| parent | 58b5f5e029207632b93bd211e746cf85d59c00ca (diff) | |
| parent | aa09c9518ca6ce24e7b659503443e5f907fbd41e (diff) | |
Merge branch 'maintainers-up' of git://repo.or.cz/qemu/afaerber
* 'maintainers-up' of git://repo.or.cz/qemu/afaerber:
MAINTAINERS: Document all stable trees
MAINTAINERS: Fix SCM tree for virtio-9p
MAINTAINERS: Indicate type of SCM
MAINTAINERS: Fix TCI file pattern
MAINTAINERS: Fix virtio-9p file pattern
MAINTAINERS: Fix PC file pattern
| -rw-r--r-- | MAINTAINERS | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8997c80930..b45f0750b2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -399,7 +399,8 @@ X86 Machines PC M: Anthony Liguori <aliguori@us.ibm.com> S: Supported -F: hw/pc.[ch] hw/pc_piix.c +F: hw/pc.[ch] +F: hw/pc_piix.c Xtensa Machines --------------- @@ -436,7 +437,7 @@ M: Paolo Bonzini <pbonzini@redhat.com> S: Supported F: hw/virtio-scsi.* F: hw/scsi* -T: git://github.com/bonzini/qemu.git scsi-next +T: git git://github.com/bonzini/qemu.git scsi-next LSI53C895A M: Paul Brook <paul@codesourcery.com> @@ -461,9 +462,9 @@ F: hw/virtio* virtio-9p M: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> 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 <kwolf@redhat.com> @@ -541,13 +542,13 @@ S: Odd Fixes F: block/nbd.c F: nbd.* F: qemu-nbd.c -T: git://github.com/bonzini/qemu.git nbd-next +T: git git://github.com/bonzini/qemu.git nbd-next SLIRP M: Jan Kiszka <jan.kiszka@siemens.com> 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 <stefanha@linux.vnet.ibm.com> @@ -556,7 +557,7 @@ F: trace/ F: scripts/tracetool.py F: scripts/tracetool/ F: docs/tracing.txt -T: git://github.com/stefanha/qemu.git tracing +T: git git://github.com/stefanha/qemu.git tracing Checkpatch M: Blue Swirl <blauwirbel@gmail.com> @@ -631,4 +632,26 @@ F: tcg/sparc/ TCI target M: Stefan Weil <sw@weilnetz.de> S: Maintained -F: tcg/tci +F: tcg/tci/ + +Stable branches +--------------- +Stable 1.0 +L: qemu-stable@nongnu.org +T: git git://git.qemu.org/qemu-stable-1.0.git +S: Orphan + +Stable 0.15 +L: qemu-stable@nongnu.org +T: git git://git.qemu.org/qemu-stable-0.15.git +S: Orphan + +Stable 0.14 +L: qemu-stable@nongnu.org +T: git git://git.qemu.org/qemu-stable-0.14.git +S: Orphan + +Stable 0.10 +L: qemu-stable@nongnu.org +T: git git://git.qemu.org/qemu-stable-0.10.git +S: Orphan |