Merge mainline/master into arm/fixes

[tomoyo/tomoyo-test1.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3c6038b..99c9a55 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1585,8 +1585,8 @@ S:        Maintained
 F:     arch/arm/mach-cns3xxx/
 
 ARM/CAVIUM THUNDER NETWORK DRIVER
-M:     Sunil Goutham <sgoutham@cavium.com>
-M:     Robert Richter <rric@kernel.org>
+M:     Sunil Goutham <sgoutham@marvell.com>
+M:     Robert Richter <rrichter@marvell.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/net/ethernet/cavium/thunder/
@@ -3229,8 +3229,7 @@ N:        kona
 F:     arch/arm/mach-bcm/
 
 BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
-M:     Eric Anholt <eric@anholt.net>
-M:     Stefan Wahren <wahrenst@gmx.net>
+M:     Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
 L:     bcm-kernel-feedback-list@broadcom.com
 L:     linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -3743,9 +3742,8 @@ S:        Maintained
 F:     drivers/net/wireless/ath/carl9170/
 
 CAVIUM I2C DRIVER
-M:     Jan Glauber <jglauber@cavium.com>
-M:     David Daney <david.daney@cavium.com>
-W:     http://www.cavium.com
+M:     Robert Richter <rrichter@marvell.com>
+W:     http://www.marvell.com
 S:     Supported
 F:     drivers/i2c/busses/i2c-octeon*
 F:     drivers/i2c/busses/i2c-thunderx*
@@ -3755,27 +3753,25 @@ M:      Derek Chickles <dchickles@marvell.com>
 M:     Satanand Burla <sburla@marvell.com>
 M:     Felix Manlunas <fmanlunas@marvell.com>
 L:     netdev@vger.kernel.org
-W:     http://www.cavium.com
+W:     http://www.marvell.com
 S:     Supported
 F:     drivers/net/ethernet/cavium/liquidio/
 
 CAVIUM MMC DRIVER
-M:     Jan Glauber <jglauber@cavium.com>
-M:     David Daney <david.daney@cavium.com>
-M:     Steven J. Hill <Steven.Hill@cavium.com>
-W:     http://www.cavium.com
+M:     Robert Richter <rrichter@marvell.com>
+W:     http://www.marvell.com
 S:     Supported
 F:     drivers/mmc/host/cavium*
 
 CAVIUM OCTEON-TX CRYPTO DRIVER
-M:     George Cherian <george.cherian@cavium.com>
+M:     George Cherian <gcherian@marvell.com>
 L:     linux-crypto@vger.kernel.org
-W:     http://www.cavium.com
+W:     http://www.marvell.com
 S:     Supported
 F:     drivers/crypto/cavium/cpt/
 
 CAVIUM THUNDERX2 ARM64 SOC
-M:     Robert Richter <rrichter@cavium.com>
+M:     Robert Richter <rrichter@marvell.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm64/boot/dts/cavium/thunder2-99xx*
@@ -5893,15 +5889,14 @@ F:      drivers/edac/highbank*
 
 EDAC-CAVIUM OCTEON
 M:     Ralf Baechle <ralf@linux-mips.org>
-M:     David Daney <david.daney@cavium.com>
+M:     Robert Richter <rrichter@marvell.com>
 L:     linux-edac@vger.kernel.org
 L:     linux-mips@vger.kernel.org
 S:     Supported
 F:     drivers/edac/octeon_edac*
 
 EDAC-CAVIUM THUNDERX
-M:     David Daney <david.daney@cavium.com>
-M:     Jan Glauber <jglauber@cavium.com>
+M:     Robert Richter <rrichter@marvell.com>
 L:     linux-edac@vger.kernel.org
 S:     Supported
 F:     drivers/edac/thunderx_edac*
@@ -12800,7 +12795,7 @@ F:      Documentation/devicetree/bindings/pci/axis,artpec*
 F:     drivers/pci/controller/dwc/*artpec*
 
 PCIE DRIVER FOR CAVIUM THUNDERX
-M:     David Daney <david.daney@cavium.com>
+M:     Robert Richter <rrichter@marvell.com>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
@@ -16373,7 +16368,7 @@ S:      Maintained
 F:     drivers/net/thunderbolt.c
 
 THUNDERX GPIO DRIVER
-M:     David Daney <david.daney@cavium.com>
+M:     Robert Richter <rrichter@marvell.com>
 S:     Maintained
 F:     drivers/gpio/gpio-thunderx.c
 
@@ -18178,10 +18173,9 @@ S:     Supported
 F:     drivers/char/xillybus/
 
 XLP9XX I2C DRIVER
-M:     George Cherian <george.cherian@cavium.com>
-M:     Jan Glauber <jglauber@cavium.com>
+M:     George Cherian <gcherian@marvell.com>
 L:     linux-i2c@vger.kernel.org
-W:     http://www.cavium.com
+W:     http://www.marvell.com
 S:     Supported
 F:     Documentation/devicetree/bindings/i2c/i2c-xlp9xx.txt
 F:     drivers/i2c/busses/i2c-xlp9xx.c