From: Olof Johansson <olof@lixom.net>
Date: Fri, 16 Jan 2015 00:15:08 +0000 (-0800)
Subject: Merge tag 'arm-soc/for-3.20/maintainer' of http://github.com/broadcom/stblinux into... 
X-Git-Tag: v4.0-rc1~72^2~5
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=8614f9f7fc8fe569341be447277d52c44731c41a;hp=-c;p=karo-tx-linux.git

Merge tag 'arm-soc/for-3.20/maintainer' of http://github.com/broadcom/stblinux into next/fixes-non-critical

Merge "Broadcom MAINTAINERS file updates for 3.20" from Florian Fainelli:

This pull request contains updates to our MAINTAINERS files for all relevant
Broadcom SoCs: BCM63xx, Cygnus/iProc, ARM & MIPS-based BCM7xxx (brcmstb).

Our new code location for all Broadcom-related kernel activities is now on
http://github.com/broadcom/.

* tag 'arm-soc/for-3.20/maintainer' of http://github.com/broadcom/stblinux:
  MAINTAINERS: add a git entry for BMIPS-based BCM7xxx SoCs
  MAINTAINERS: add a git entry for BCM7xxx ARM-based SoCs
  MAINTAINERS: update Broadcom Cygnus SoC git tree
  MAINTAINERS: move BCM63xx ARM-based SoCs git tree

Signed-off-by: Olof Johansson <olof@lixom.net>
---

8614f9f7fc8fe569341be447277d52c44731c41a
diff --combined MAINTAINERS
index 3589d67437f8,1e382ed55000..b04053f70cb1
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -724,15 -724,15 +724,15 @@@ F:	include/uapi/linux/apm_bios.
  F:	drivers/char/apm-emulation.c
  
  APPLE BCM5974 MULTITOUCH DRIVER
 -M:	Henrik Rydberg <rydberg@euromail.se>
 +M:	Henrik Rydberg <rydberg@bitmath.org>
  L:	linux-input@vger.kernel.org
 -S:	Maintained
 +S:	Odd fixes
  F:	drivers/input/mouse/bcm5974.c
  
  APPLE SMC DRIVER
 -M:	Henrik Rydberg <rydberg@euromail.se>
 +M:	Henrik Rydberg <rydberg@bitmath.org>
  L:	lm-sensors@lm-sensors.org
 -S:	Maintained
 +S:	Odd fixes
  F:	drivers/hwmon/applesmc.c
  
  APPLETALK NETWORK LAYER
@@@ -2124,7 -2124,7 +2124,7 @@@ F:	arch/arm/boot/dts/bcm470
  BROADCOM BCM63XX ARM ARCHITECTURE
  M:	Florian Fainelli <f.fainelli@gmail.com>
  L:	linux-arm-kernel@lists.infradead.org
- T:	git git://git.github.com/brcm/linux.git
+ T:	git git://git.github.com/broadcom/arm-bcm63xx.git
  S:	Maintained
  F:	arch/arm/mach-bcm/bcm63xx.c
  F:	arch/arm/include/debug/bcm63xx.S
@@@ -2141,6 -2141,7 +2141,7 @@@ M:	Brian Norris <computersforpeace@gmai
  M:	Gregory Fong <gregory.0xf0@gmail.com>
  M:	Florian Fainelli <f.fainelli@gmail.com>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ T:	git git://git.github.com/broadcom/stblinux.git
  S:	Maintained
  F:	arch/arm/mach-bcm/*brcmstb*
  F:	arch/arm/boot/dts/bcm7*.dts*
@@@ -2150,6 -2151,7 +2151,7 @@@ BROADCOM BMIPS MIPS ARCHITECTUR
  M:	Kevin Cernekee <cernekee@gmail.com>
  M:	Florian Fainelli <f.fainelli@gmail.com>
  L:	linux-mips@linux-mips.org
+ T:	git git://git.github.com/broadcom/stblinux.git
  S:	Maintained
  F:	arch/mips/bmips/*
  F:	arch/mips/include/asm/mach-bmips/*
@@@ -2192,7 -2194,7 +2194,7 @@@ M:	Ray Jui <rjui@broadcom.com
  M:	Scott Branden <sbranden@broadcom.com>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:	bcm-kernel-feedback-list@broadcom.com
- T:	git git://git.github.com/brcm/linux.git
+ T:	git git://git.github.com/broadcom/cygnus-linux.git
  S:	Maintained
  N:	iproc
  N:	cygnus
@@@ -2259,7 -2261,6 +2261,7 @@@ F:	drivers/gpio/gpio-bt8xx.
  BTRFS FILE SYSTEM
  M:	Chris Mason <clm@fb.com>
  M:	Josef Bacik <jbacik@fb.com>
 +M:	David Sterba <dsterba@suse.cz>
  L:	linux-btrfs@vger.kernel.org
  W:	http://btrfs.wiki.kernel.org/
  Q:	http://patchwork.kernel.org/project/linux-btrfs/list/
@@@ -4941,10 -4942,10 +4943,10 @@@ F:	include/uapi/linux/input.
  F:	include/linux/input/
  
  INPUT MULTITOUCH (MT) PROTOCOL
 -M:	Henrik Rydberg <rydberg@euromail.se>
 +M:	Henrik Rydberg <rydberg@bitmath.org>
  L:	linux-input@vger.kernel.org
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git
 -S:	Maintained
 +S:	Odd fixes
  F:	Documentation/input/multi-touch-protocol.txt
  F:	drivers/input/input-mt.c
  K:	\b(ABS|SYN)_MT_