Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 53 insertions, 31 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5eede718b13e..ae8cd00215b2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -156,7 +156,6 @@ F:	drivers/net/hamradio/6pack.c
 
 8169 10/100/1000 GIGABIT ETHERNET DRIVER
 M:      Realtek linux nic maintainers <nic_swsd@realtek.com>
-M:      Francois Romieu <romieu@fr.zoreil.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ethernet/realtek/r8169.c
@@ -943,16 +942,10 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
 F:      arch/arm/mach-imx/
+F:      arch/arm/mach-mxs/
 F:      arch/arm/boot/dts/imx*
 F:      arch/arm/configs/imx*_defconfig
 
-ARM/FREESCALE MXS ARM ARCHITECTURE
-M:      Shawn Guo <shawn.guo@linaro.org>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-T:      git git://git.linaro.org/people/shawnguo/linux-2.6.git
-F:      arch/arm/mach-mxs/
-
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1052,9 +1045,33 @@ M:	Santosh Shilimkar <santosh.shilimkar@ti.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-keystone/
-F:      drivers/clk/keystone/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
 
+ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/clk/keystone/
+
+ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/clocksource/timer-keystone.c
+
+ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/power/reset/keystone-reset.c
+
+ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/memory/*emif*
+
 ARM/LOGICPD PXA270 MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1296,6 +1313,20 @@ W:	http://oss.renesas.com
 Q:      http://patchwork.kernel.org/project/linux-sh/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:      Supported
+F:      arch/arm/boot/dts/emev2*
+F:      arch/arm/boot/dts/r7s*
+F:      arch/arm/boot/dts/r8a*
+F:      arch/arm/boot/dts/sh*
+F:      arch/arm/configs/ape6evm_defconfig
+F:      arch/arm/configs/armadillo800eva_defconfig
+F:      arch/arm/configs/bockw_defconfig
+F:      arch/arm/configs/genmai_defconfig
+F:      arch/arm/configs/koelsch_defconfig
+F:      arch/arm/configs/kzm9g_defconfig
+F:      arch/arm/configs/lager_defconfig
+F:      arch/arm/configs/mackerel_defconfig
+F:      arch/arm/configs/marzen_defconfig
+F:      arch/arm/configs/shmobile_defconfig
 F:      arch/arm/mach-shmobile/
 F:      drivers/sh/
 
@@ -2918,6 +2949,9 @@ L:	linux-doc@vger.kernel.org
 T:      quilt http://www.infradead.org/~rdunlap/Doc/patches/
 S:      Maintained
 F:      Documentation/
+X:      Documentation/ABI/
+X:      Documentation/devicetree/
+X:      Documentation/[a-z][a-z]_[A-Z][A-Z]/
 
 DOUBLETALK DRIVER
 M:      "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@ -4477,8 +4511,7 @@ S:	Supported
 F:      drivers/idle/i7300_idle.c
 
 IEEE 802.15.4 SUBSYSTEM
-M:      Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
-M:      Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+M:      Alexander Aring <alex.aring@gmail.com>
 L:      linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://apps.sourceforge.net/trac/linux-zigbee
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
@@ -5510,10 +5543,11 @@ S:	Maintained
 F:      arch/arm/mach-lpc32xx/
 
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
-M:      Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
-M:      Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
-M:      support@lsi.com
-L:      DL-MPTFusionLinux@lsi.com
+M:      Nagalakshmi Nandigama <nagalakshmi.nandigama@avagotech.com>
+M:      Praveen Krishnamoorthy <praveen.krishnamoorthy@avagotech.com>
+M:      Sreekanth Reddy <sreekanth.reddy@avagotech.com>
+M:      Abhijit Mahajan <abhijit.mahajan@avagotech.com>
+L:      MPT-FusionLinux.pdl@avagotech.com
 L:      linux-scsi@vger.kernel.org
 W:      http://www.lsilogic.com/support
 S:      Supported
@@ -6756,7 +6790,7 @@ F:	arch/x86/kernel/quirks.c
 
 PCI DRIVER FOR IMX6
 M:      Richard Zhu <r65037@freescale.com>
-M:      Shawn Guo <shawn.guo@linaro.org>
+M:      Shawn Guo <shawn.guo@freescale.com>
 L:      linux-pci@vger.kernel.org
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
@@ -8953,7 +8987,7 @@ F:	drivers/media/radio/radio-raremono.c
 
 THERMAL
 M:      Zhang Rui <rui.zhang@intel.com>
-M:      Eduardo Valentin <eduardo.valentin@ti.com>
+M:      Eduardo Valentin <edubezval@gmail.com>
 L:      linux-pm@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
@@ -8980,7 +9014,7 @@ S:	Maintained
 F:      drivers/platform/x86/thinkpad_acpi.c
 
 TI BANDGAP AND THERMAL DRIVER
-M:      Eduardo Valentin <eduardo.valentin@ti.com>
+M:      Eduardo Valentin <edubezval@gmail.com>
 L:      linux-pm@vger.kernel.org
 S:      Supported
 F:      drivers/thermal/ti-soc-thermal/
@@ -9394,12 +9428,6 @@ S:	Maintained
 F:      drivers/usb/host/isp116x*
 F:      include/linux/usb/isp116x.h
 
-USB KAWASAKI LSI DRIVER
-M:      Oliver Neukum <oliver@neukum.org>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/kl5kusb105.*
-
 USB MASS STORAGE DRIVER
 M:      Matthew Dharm <mdharm-usb@one-eyed-alien.net>
 L:      linux-usb@vger.kernel.org
@@ -9427,12 +9455,6 @@ S:	Maintained
 F:      Documentation/usb/ohci.txt
 F:      drivers/usb/host/ohci*
 
-USB OPTION-CARD DRIVER
-M:      Matthias Urlichs <smurf@smurf.noris.de>
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-F:      drivers/usb/serial/option.c
-
 USB PEGASUS DRIVER
 M:      Petko Manolov <petkan@nucleusys.com>
 L:      linux-usb@vger.kernel.org
@@ -9465,7 +9487,7 @@ S:	Maintained
 F:      drivers/net/usb/rtl8150.c
 
 USB SERIAL SUBSYSTEM
-M:      Johan Hovold <jhovold@gmail.com>
+M:      Johan Hovold <johan@kernel.org>
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 F:      Documentation/usb/usb-serial.txt