diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-02-22 23:58:09 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-22 23:58:09 +0100 |
commit | fb25e2d8ba41d755ccddd730b901df26118d1e3e (patch) | |
tree | d6deafd2d4d84d9078b0a27175f41b987bd0ffb2 /MAINTAINERS | |
parent | 39374564c1c891d4ebea102d88f9e6bee3397d94 (diff) | |
parent | 49b35cd5e7ddad04ae2fac614cd26f29c4851957 (diff) |
Merge branch 'arm/soc' into for-next
* arm/soc:
MAINTAINERS: Update Ampere email address
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 931b5ab4a2df..c0ddd34141e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1037,26 +1037,26 @@ F: drivers/net/appletalk/ F: net/appletalk/ APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT -M: Duc Dang <dhdang@apm.com> +M: Khuong Dinh <khuong@os.amperecomputing.com> S: Supported F: arch/arm64/boot/dts/apm/ APPLIED MICRO (APM) X-GENE SOC EDAC -M: Loc Ho <lho@apm.com> +M: Khuong Dinh <khuong@os.amperecomputing.com> S: Supported F: drivers/edac/xgene_edac.c F: Documentation/devicetree/bindings/edac/apm-xgene-edac.txt APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER -M: Iyappan Subramanian <isubramanian@apm.com> -M: Keyur Chudgar <kchudgar@apm.com> +M: Iyappan Subramanian <iyappan@os.amperecomputing.com> +M: Keyur Chudgar <keyur@os.amperecomputing.com> S: Supported F: drivers/net/ethernet/apm/xgene-v2/ APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER -M: Iyappan Subramanian <isubramanian@apm.com> -M: Keyur Chudgar <kchudgar@apm.com> -M: Quan Nguyen <qnguyen@apm.com> +M: Iyappan Subramanian <iyappan@os.amperecomputing.com> +M: Keyur Chudgar <keyur@os.amperecomputing.com> +M: Quan Nguyen <quan@os.amperecomputing.com> S: Supported F: drivers/net/ethernet/apm/xgene/ F: drivers/net/phy/mdio-xgene.c @@ -1064,7 +1064,7 @@ F: Documentation/devicetree/bindings/net/apm-xgene-enet.txt F: Documentation/devicetree/bindings/net/apm-xgene-mdio.txt APPLIED MICRO (APM) X-GENE SOC PMU -M: Tai Nguyen <ttnguyen@apm.com> +M: Khuong Dinh <khuong@os.amperecomputing.com> S: Supported F: drivers/perf/xgene_pmu.c F: Documentation/perf/xgene-pmu.txt @@ -11598,7 +11598,7 @@ F: Documentation/devicetree/bindings/pci/altera-pcie.txt F: drivers/pci/controller/pcie-altera.c PCI DRIVER FOR APPLIEDMICRO XGENE -M: Tanmay Inamdar <tinamdar@apm.com> +M: Toan Le <toan@os.amperecomputing.com> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org S: Maintained @@ -11776,7 +11776,7 @@ F: Documentation/devicetree/bindings/pci/altera-pcie-msi.txt F: drivers/pci/controller/pcie-altera-msi.c PCI MSI DRIVER FOR APPLIEDMICRO XGENE -M: Duc Dang <dhdang@apm.com> +M: Toan Le <toan@os.amperecomputing.com> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org S: Maintained @@ -14735,7 +14735,7 @@ S: Maintained F: drivers/tty/serial/8250/8250_dw.c SYNOPSYS DESIGNWARE APB GPIO DRIVER -M: Hoan Tran <hotran@apm.com> +M: Hoan Tran <hoan@os.amperecomputing.com> L: linux-gpio@vger.kernel.org S: Maintained F: drivers/gpio/gpio-dwapb.c |