Merge tag 'arm-soc/for-4.6/maintainers' of http://github.com/Broadcom/stblinux into...

Merge "Broadcom maintainers changes for 4.6" from Florian Fainelli:

This pull request contains MAINTAINERS file updates for Broadcom ARM-based SoCs:

- Florian updates the Broadcom BCM63xx ARM-based DSL SoCs to use the same mailing-list
  and development tree as all the other Broadcom SoCS

* tag 'arm-soc/for-4.6/maintainers' of http://github.com/Broadcom/stblinux:
  MAINTAINERS: ARM: BCM63xx: Update git and mailing-lists

diff --combined MAINTAINERS
index d32c1aa149d27d6531c57210572018ae0886a08b,7f579c8354766ebad0438918f50b563de452f9ee..57fef057780307e32b0cc6724516d2a9a75d8866
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -223,7 -223,9 +223,7 @@@ F: drivers/scsi/aacraid
  
  ABI/API
  L:    [email protected]
 -F:    Documentation/ABI/
  F:    include/linux/syscalls.h
 -F:    include/uapi/
  F:    kernel/sys_ni.c
  
  ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
@@@ -684,6 -686,13 +684,6 @@@ M:        Michael Hanselmann <linux-kernel@han
  S:    Supported
  F:    drivers/macintosh/ams/
  
 -AMSO1100 RNIC DRIVER
 -M:    Tom Tucker <[email protected]>
 -M:    Steve Wise <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/infiniband/hw/amso1100/
 -
  ANALOG DEVICES INC AD9389B DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -932,16 -941,6 +932,16 @@@ M:       Tsahee Zidenberg <tsahee@annapurnala
  S:    Maintained
  F:    arch/arm/mach-alpine/
  
 +ARM/ARTPEC MACHINE SUPPORT
 +M:    Jesper Nilsson <[email protected]>
 +M:    Lars Persson <[email protected]>
 +M:    Niklas Cassel <[email protected]>
 +S:    Maintained
 +L:    [email protected]
 +F:    arch/arm/mach-artpec
 +F:    arch/arm/boot/dts/artpec6*
 +F:    drivers/clk/clk-artpec6.c
 +
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:    Nicolas Ferre <[email protected]>
  M:    Alexandre Belloni <[email protected]>
@@@ -968,8 -967,6 +968,8 @@@ M: Rob Herring <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-highbank/
 +F:    arch/arm/boot/dts/highbank.dts
 +F:    arch/arm/boot/dts/ecx-*.dts*
  
  ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
  M:    Krzysztof Halasa <[email protected]>
@@@ -1045,7 -1042,6 +1045,7 @@@ M:      Barry Song <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
  S:    Maintained
 +F:    arch/arm/boot/dts/prima2*
  F:    arch/arm/mach-prima2/
  F:    drivers/clk/sirf/
  F:    drivers/clocksource/timer-prima2.c
@@@ -1147,10 -1143,6 +1147,10 @@@ W:    http://www.hisilicon.co
  S:    Supported
  T:    git git://github.com/hisilicon/linux-hisi.git
  F:    arch/arm/mach-hisi/
 +F:    arch/arm/boot/dts/hi3*
 +F:    arch/arm/boot/dts/hip*
 +F:    arch/arm/boot/dts/hisi*
 +F:    arch/arm64/boot/dts/hisilicon/
  
  ARM/HP JORNADA 7XX MACHINE SUPPORT
  M:    Kristoffer Ericson <[email protected]>
@@@ -1227,7 -1219,6 +1227,7 @@@ M:      Santosh Shilimkar <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
 +F:    arch/arm/boot/dts/k2*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
  ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
@@@ -1296,7 -1287,6 +1296,7 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/arm/mach-berlin/
  F:    arch/arm/boot/dts/berlin*
 +F:    arch/arm64/boot/dts/marvell/berlin*
  
  
  ARM/Marvell Dove/MV78xx0/Orion SOC support
@@@ -1435,7 -1425,6 +1435,7 @@@ S:      Maintaine
  F:    arch/arm/boot/dts/qcom-*.dts
  F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
 +F:    arch/arm64/boot/dts/qcom/*
  F:    drivers/soc/qcom/
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
@@@ -1495,8 -1484,6 +1495,8 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/s3c*
 +F:    arch/arm/boot/dts/s5p*
 +F:    arch/arm/boot/dts/samsung*
  F:    arch/arm/boot/dts/exynos*
  F:    arch/arm64/boot/dts/exynos/
  F:    arch/arm/plat-samsung/
@@@ -1576,7 -1563,6 +1576,7 @@@ S:      Maintaine
  F:    arch/arm/mach-socfpga/
  F:    arch/arm/boot/dts/socfpga*
  F:    arch/arm/configs/socfpga_defconfig
 +F:    arch/arm64/boot/dts/altera/
  W:    http://www.rocketboards.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  
@@@ -1730,7 -1716,7 +1730,7 @@@ M:      Lorenzo Pieralisi <lorenzo.pieralisi
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/vexpress*
 -F:    arch/arm64/boot/dts/arm/vexpress*
 +F:    arch/arm64/boot/dts/arm/
  F:    arch/arm/mach-vexpress/
  F:    */*/vexpress*
  F:    */*/*/vexpress*
@@@ -2357,7 -2343,6 +2357,7 @@@ F:      arch/arm/mach-bcm
  F:    arch/arm/boot/dts/bcm113*
  F:    arch/arm/boot/dts/bcm216*
  F:    arch/arm/boot/dts/bcm281*
 +F:    arch/arm64/boot/dts/broadcom/
  F:    arch/arm/configs/bcm_defconfig
  F:    drivers/mmc/host/sdhci-bcm-kona.c
  F:    drivers/clocksource/bcm_kona_timer.c
@@@ -2398,8 -2383,9 +2398,9 @@@ F:      arch/arm/boot/dts/bcm470
  
  BROADCOM BCM63XX ARM ARCHITECTURE
  M:    Florian Fainelli <[email protected]>
- L:    [email protected]
- T:    git git://github.com/broadcom/arm-bcm63xx.git
+ L:    [email protected] (moderated for non-subscribers)
+ L:    [email protected]
+ T:    git git://github.com/broadcom/stblinux.git
  S:    Maintained
  F:    arch/arm/mach-bcm/bcm63xx.c
  F:    arch/arm/include/debug/bcm63xx.S
@@@ -3460,7 -3446,7 +3461,7 @@@ S:      Maintaine
  F:    drivers/usb/dwc2/
  
  DESIGNWARE USB3 DRD IP DRIVER
 -M:    Felipe Balbi <balbi@ti.com>
 +M:    Felipe Balbi <balbi@kernel.org>
  L:    [email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@@ -4199,6 -4185,13 +4200,6 @@@ W:     http://aeschi.ch.eu.org/efs
  S:    Orphan
  F:    fs/efs/
  
 -EHCA (IBM GX bus InfiniBand adapter) DRIVER
 -M:    Hoang-Nam Nguyen <[email protected]>
 -M:    Christoph Raisch <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/infiniband/hw/ehca/
 -
  EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
  M:    Thadeu Lima de Souza Cascardo <[email protected]>
  L:    [email protected]
@@@ -5817,6 -5810,12 +5818,6 @@@ M:     Juanjo Ciarlante <[email protected]
  S:    Maintained
  F:    net/ipv4/netfilter/ipt_MASQUERADE.c
  
 -IPATH DRIVER
 -M:    Mike Marciniszyn <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/rdma/ipath/
 -
  IPMI SUBSYSTEM
  M:    Corey Minyard <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -7372,7 -7371,7 +7373,7 @@@ F:      drivers/tty/isicom.
  F:    include/linux/isicom.h
  
  MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
 -M:    Felipe Balbi <balbi@ti.com>
 +M:    Felipe Balbi <balbi@kernel.org>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
@@@ -7941,7 -7940,7 +7942,7 @@@ F:      drivers/media/platform/omap3isp
  F:    drivers/staging/media/omap4iss/
  
  OMAP USB SUPPORT
 -M:    Felipe Balbi <balbi@ti.com>
 +M:    Felipe Balbi <balbi@kernel.org>
  L:    [email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@@ -8820,7 -8819,6 +8821,7 @@@ L:      [email protected]
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://github.com/rjarzmik/linux.git
  S:    Maintained
 +F:    arch/arm/boot/dts/pxa*
  F:    arch/arm/mach-pxa/
  F:    drivers/dma/pxa*
  F:    drivers/pcmcia/pxa2xx*
@@@ -8850,7 -8848,6 +8851,7 @@@ L:      [email protected]
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
  S:    Maintained
 +F:    arch/arm/boot/dts/mmp*
  F:    arch/arm/mach-mmp/
  
  PXA MMCI DRIVER
@@@ -10162,7 -10159,6 +10163,7 @@@ S:   Supporte
  F:    drivers/media/pci/solo6x10/
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
 +M:    Shaohua Li <[email protected]>
  L:    [email protected]
  T:    git git://neil.brown.name/md
  S:    Supported
@@@ -10178,7 -10174,7 +10179,7 @@@ F:   drivers/net/ethernet/natsemi/sonic.
  
  SONICS SILICON BACKPLANE DRIVER (SSB)
  M:    Michael Buesch <[email protected]>
 -L:    netdev@vger.kernel.org
 +L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/ssb/
  F:    include/linux/ssb/
@@@ -10296,7 -10292,6 +10297,7 @@@ L:   [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
 +F:    arch/arm/boot/dts/spear*
  F:    arch/arm/mach-spear/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
@@@ -11324,7 -11319,7 +11325,7 @@@ F:   Documentation/usb/ehci.tx
  F:    drivers/usb/host/ehci*
  
  USB GADGET/PERIPHERAL SUBSYSTEM
 -M:    Felipe Balbi <balbi@ti.com>
 +M:    Felipe Balbi <balbi@kernel.org>
  L:    [email protected]
  W:    http://www.linux-usb.org/gadget
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@@ -11400,7 -11395,7 +11401,7 @@@ S:   Maintaine
  F:    drivers/net/usb/pegasus.*
  
  USB PHY LAYER
 -M:    Felipe Balbi <balbi@ti.com>
 +M:    Felipe Balbi <balbi@kernel.org>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
@@@ -12139,7 -12134,7 +12140,7 @@@ F:   drivers/net/hamradio/*scc.
  F:    drivers/net/hamradio/z8530.h
  
  ZBUD COMPRESSED PAGE ALLOCATOR
 -M:    Seth Jennings <sjenning[email protected]>
 +M:    Seth Jennings <sjenning@redhat.com>
  L:    [email protected]
  S:    Maintained
  F:    mm/zbud.c
@@@ -12194,7 -12189,7 +12195,7 @@@ F:   include/linux/zsmalloc.
  F:    Documentation/vm/zsmalloc.txt
  
  ZSWAP COMPRESSED SWAP CACHING
 -M:    Seth Jennings <sjenning[email protected]>
 +M:    Seth Jennings <sjenning@redhat.com>
  L:    [email protected]
  S:    Maintained
  F:    mm/zswap.c