Fix up MAINTAINERS file sorting

Another merge window, another MAINTAINERS file disaster.

People have serious problems with the alphabet and sorting, and poor
Jérôme Glisse and Radim Krčmář get their names mangled by locale issues,
turning them into some mangled mess (probably others do too, but those
two stood out when sorting things again).

And we now have two copies of the same 'AS3645A LED FLASH CONTROLLER
DRIVER' in the tree and in the MAINTAINERS file, but that's a separate
issue - the duplication is real, and I left them as two entries for the
same name.

This does not try to sort the actual section pattern entries, although I
may end up doing that later.

Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/MAINTAINERS b/MAINTAINERS
index 7be4129ec9514bf17e1327a0a1f137c74772dfe1..b61848afb9d2618ab5eb1be26a3d3c41eff6c451 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4391,6 +4391,12 @@ S:       Supported
 F:     drivers/gpu/drm/nouveau/
 F:     include/uapi/drm/nouveau_drm.h
 
+DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
+M:     Noralf Trønnes <[email protected]>
+S:     Maintained
+F:     drivers/gpu/drm/tinydrm/repaper.c
+F:     Documentation/devicetree/bindings/display/repaper.txt
+
 DRM DRIVER FOR QEMU'S CIRRUS DEVICE
 M:     Dave Airlie <[email protected]>
 M:     Gerd Hoffmann <[email protected]>
@@ -4409,12 +4415,6 @@ S:       Maintained
 F:     drivers/gpu/drm/qxl/
 F:     include/uapi/drm/qxl_drm.h
 
-DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
-M:     Noralf Trønnes <[email protected]>
-S:     Maintained
-F:     drivers/gpu/drm/tinydrm/repaper.c
-F:     Documentation/devicetree/bindings/display/repaper.txt
-
 DRM DRIVER FOR RAGE 128 VIDEO CARDS
 S:     Orphan / Obsolete
 F:     drivers/gpu/drm/r128/
@@ -6208,22 +6208,22 @@ F:      include/uapi/linux/if_hippi.h
 F:     net/802/hippi.c
 F:     drivers/net/hippi/
 
-HISILICON NETWORK SUBSYSTEM DRIVER
+HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
 M:     Yisen Zhuang <[email protected]>
 M:     Salil Mehta <[email protected]>
 L:     [email protected]
 W:     http://www.hisilicon.com
 S:     Maintained
-F:     drivers/net/ethernet/hisilicon/
-F:     Documentation/devicetree/bindings/net/hisilicon*.txt
+F:     drivers/net/ethernet/hisilicon/hns3/
 
-HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
+HISILICON NETWORK SUBSYSTEM DRIVER
 M:     Yisen Zhuang <[email protected]>
 M:     Salil Mehta <[email protected]>
 L:     [email protected]
 W:     http://www.hisilicon.com
 S:     Maintained
-F:     drivers/net/ethernet/hisilicon/hns3/
+F:     drivers/net/ethernet/hisilicon/
+F:     Documentation/devicetree/bindings/net/hisilicon*.txt
 
 HISILICON ROCE DRIVER
 M:     Lijun Ou <[email protected]>
@@ -6240,6 +6240,13 @@ S:       Supported
 F:     drivers/scsi/hisi_sas/
 F:     Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
 
+HMM - Heterogeneous Memory Management
+M:     Jérôme Glisse <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     mm/hmm*
+F:     include/linux/hmm*
+
 HOST AP DRIVER
 M:     Jouni Malinen <[email protected]>
 L:     [email protected]
@@ -7506,19 +7513,6 @@ F:       include/kvm/iodev.h
 F:     virt/kvm/*
 F:     tools/kvm/
 
-KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
-M:     Paolo Bonzini <[email protected]>
-M:     Radim KrÄmář <[email protected]>
-L:     [email protected]
-W:     http://www.linux-kvm.org
-T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
-S:     Supported
-F:     arch/x86/kvm/
-F:     arch/x86/include/uapi/asm/kvm*
-F:     arch/x86/include/asm/kvm*
-F:     arch/x86/kernel/kvm.c
-F:     arch/x86/kernel/kvmclock.c
-
 KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
 M:     Joerg Roedel <[email protected]>
 L:     [email protected]
@@ -7541,17 +7535,6 @@ F:       arch/arm/kvm/
 F:     virt/kvm/arm/
 F:     include/kvm/arm_*
 
-KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
-M:     Alexander Graf <[email protected]>
-L:     [email protected]
-W:     http://www.linux-kvm.org/
-T:     git git://github.com/agraf/linux-2.6.git
-S:     Supported
-F:     arch/powerpc/include/uapi/asm/kvm*
-F:     arch/powerpc/include/asm/kvm*
-F:     arch/powerpc/kvm/
-F:     arch/powerpc/kernel/kvm*
-
 KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
 M:     Christoffer Dall <[email protected]>
 M:     Marc Zyngier <[email protected]>
@@ -7570,6 +7553,17 @@ F:       arch/mips/include/uapi/asm/kvm*
 F:     arch/mips/include/asm/kvm*
 F:     arch/mips/kvm/
 
+KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
+M:     Alexander Graf <[email protected]>
+L:     [email protected]
+W:     http://www.linux-kvm.org/
+T:     git git://github.com/agraf/linux-2.6.git
+S:     Supported
+F:     arch/powerpc/include/uapi/asm/kvm*
+F:     arch/powerpc/include/asm/kvm*
+F:     arch/powerpc/kvm/
+F:     arch/powerpc/kernel/kvm*
+
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 M:     Christian Borntraeger <[email protected]>
 M:     Cornelia Huck <[email protected]>
@@ -7583,6 +7577,19 @@ F:       arch/s390/include/asm/kvm*
 F:     arch/s390/kvm/
 F:     arch/s390/mm/gmap.c
 
+KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
+M:     Paolo Bonzini <[email protected]>
+M:     Radim Krčmář <[email protected]>
+L:     [email protected]
+W:     http://www.linux-kvm.org
+T:     git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+S:     Supported
+F:     arch/x86/kvm/
+F:     arch/x86/include/uapi/asm/kvm*
+F:     arch/x86/include/asm/kvm*
+F:     arch/x86/kernel/kvm.c
+F:     arch/x86/kernel/kvmclock.c
+
 KERNFS
 M:     Greg Kroah-Hartman <[email protected]>
 M:     Tejun Heo <[email protected]>
@@ -7822,13 +7829,6 @@ M:       Sasha Levin <[email protected]>
 S:     Maintained
 F:     tools/lib/lockdep/
 
-HMM - Heterogeneous Memory Management
-M:     Jérôme Glisse <[email protected]>
-L:     [email protected]
-S:     Maintained
-F:     mm/hmm*
-F:     include/linux/hmm*
-
 LIBNVDIMM BLK: MMIO-APERTURE DRIVER
 M:     Ross Zwisler <[email protected]>
 L:     [email protected]
@@ -8423,6 +8423,14 @@ T:       git git://linuxtv.org/media_tree.git
 S:     Supported
 F:     drivers/media/dvb-frontends/cxd2841er*
 
+MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
+M:     Daniel Scheller <[email protected]>
+L:     [email protected]
+W:     https://linuxtv.org
+T:     git git://linuxtv.org/media_tree.git
+S:     Maintained
+F:     drivers/media/pci/ddbridge/*
+
 MEDIA DRIVERS FOR FREESCALE IMX
 M:     Steve Longerbeam <[email protected]>
 M:     Philipp Zabel <[email protected]>
@@ -8544,14 +8552,6 @@ T:       git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/dvb-frontends/stv6111*
 
-MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
-M:     Daniel Scheller <[email protected]>
-L:     [email protected]
-W:     https://linuxtv.org
-T:     git git://linuxtv.org/media_tree.git
-S:     Maintained
-F:     drivers/media/pci/ddbridge/*
-
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 M:     Mauro Carvalho Chehab <[email protected]>
 M:     Mauro Carvalho Chehab <[email protected]>
@@ -8575,6 +8575,11 @@ F:       include/uapi/linux/meye.h
 F:     include/uapi/linux/ivtv*
 F:     include/uapi/linux/uvcvideo.h
 
+MEDIATEK CIR DRIVER
+M:     Sean Wang <[email protected]>
+S:     Maintained
+F:     drivers/media/rc/mtk-cir.c
+
 MEDIATEK ETHERNET DRIVER
 M:     Felix Fietkau <[email protected]>
 M:     John Crispin <[email protected]>
@@ -8615,11 +8620,6 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/net/wireless/mediatek/mt7601u/
 
-MEDIATEK CIR DRIVER
-M:     Sean Wang <[email protected]>
-S:     Maintained
-F:     drivers/media/rc/mtk-cir.c
-
 MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
 M:     Sean Wang <[email protected]>
 S:     Maintained