MAINTAINERS: sort and update tree info

Move a few misplaced entries into their intended (alphabetical) slots.

Update qemu and mini-os tree info.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>

--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -138,11 +138,6 @@ F:	xen/drivers/char/omap-uart.c
 F:	xen/drivers/char/pl011.c
 F:	xen/drivers/passthrough/arm/
 
-HISILICON HIP04 SUPPORT
-M:	Zoltan Kiss <zoltan.kiss@xxxxxxxxxx>
-S:	Supported
-F:	xen/arch/arm/gic-hip04.c
-
 CPU POOLS
 M:	Juergen Gross <jgross@xxxxxxxx>
 M:	Dario Faggioli <dario.faggioli@xxxxxxxxxx>
@@ -180,10 +175,10 @@ S:	Supported
 F:	xen/arch/x86/debug.c
 F:	tools/debugger/gdbsx/
 
-KDD DEBUGGER
-M:	Tim Deegan <tim@xxxxxxx>
-S:	Odd Fixes
-F:	tools/debugger/kdd/
+HISILICON HIP04 SUPPORT
+M:	Zoltan Kiss <zoltan.kiss@xxxxxxxxxx>
+S:	Supported
+F:	xen/arch/arm/gic-hip04.c
 
 INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
 M:	Gang Wei <gang.wei@xxxxxxxxx>
@@ -216,6 +211,11 @@ X:	xen/drivers/passthrough/vtd/
 X:	xen/drivers/passthrough/device_tree.c
 F:	xen/include/xen/iommu.h
 
+KDD DEBUGGER
+M:	Tim Deegan <tim@xxxxxxx>
+S:	Odd Fixes
+F:	tools/debugger/kdd/
+
 KEXEC
 M:      David Vrabel <david.vrabel@xxxxxxxxxx>
 S:      Supported
@@ -235,8 +235,8 @@ M:	Stefano Stabellini <stefano.stabellin
 M:	Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
 S:	Supported
 L:	minios-devel@xxxxxxxxxxxxxxxxxxxx
+T:	git git://xenbits.xen.org/mini-os.git
 F:	config/MiniOS.mk
-F:	extras/mini-os/
 
 OCAML TOOLS
 M:	David Scott <dave@xxxxxxxxxx>
@@ -262,12 +262,12 @@ F:	xen/include/acpi/cpufreq/
 QEMU-DM
 M:	Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
 S:	Supported
-T:	git git://xenbits.xen.org/qemu-xen-*.git
+T:	git git://xenbits.xen.org/qemu-xen-traditional.git
 
 QEMU UPSTREAM
 M:	Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
 S:	Supported
-T:	git git://xenbits.xen.org/qemu-upstream-*.git
+T:	git git://xenbits.xen.org/qemu-xen.git
 
 REMUS
 M:	Shriram Rajagopalan <rshriram@xxxxxxxxx>
@@ -345,6 +345,17 @@ S:	Supported
 T:	hg http://xenbits.xen.org/linux-2.6.18-xen.hg
 F:	drivers/xen/usb*/
 
+VM EVENT AND MEM ACCESS
+M:	Razvan Cojocaru <rcojocaru@xxxxxxxxxxxxxxx>
+M:	Tamas K Lengyel <tamas@xxxxxxxxxxxxx>
+S:	Supported
+F:	xen/common/vm_event.c
+F:	xen/common/mem_access.c
+F:	xen/arch/x86/hvm/event.c
+F:	xen/arch/x86/monitor.c
+F:	xen/arch/x86/vm_event.c
+F:	tools/tests/xen-access
+
 VTPM
 M:	Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
 M:	Quan Xu <quan.xu@xxxxxxxxx>
@@ -386,17 +397,6 @@ M:	Tim Deegan <tim@xxxxxxx>
 S:	Maintained
 F:	xen/arch/x86/mm/shadow/
 
-VM EVENT AND MEM ACCESS
-M:	Razvan Cojocaru <rcojocaru@xxxxxxxxxxxxxxx>
-M:	Tamas K Lengyel <tamas@xxxxxxxxxxxxx>
-S:	Supported
-F:	xen/common/vm_event.c
-F:	xen/common/mem_access.c
-F:	xen/arch/x86/hvm/event.c
-F:	xen/arch/x86/monitor.c
-F:	xen/arch/x86/vm_event.c
-F:	tools/tests/xen-access
-
 XENTRACE
 M:	George Dunlap <george.dunlap@xxxxxxxxxxxxx>
 S:	Supported