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

Bring in the 'net' tree so that we can get some ipv4/ipv6 bug
fixes that some net-next work will build upon.

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

1 files changed, 13 insertions, 14 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a7aadea909df..b5ab4d9a48a7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1972,9 +1972,9 @@ S:	Maintained
 F:      drivers/usb/host/ohci-ep93xx.c
 
 CIRRUS LOGIC CS4270 SOUND DRIVER
-M:      Timur Tabi <timur@freescale.com>
+M:      Timur Tabi <timur@tabi.org>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
-S:      Supported
+S:      Odd Fixes
 F:      sound/soc/codecs/cs4270*
 
 CLEANCACHE API
@@ -2966,7 +2966,7 @@ S:	Maintained
 F:      drivers/net/ethernet/i825xx/eexpress.*
 
 ETHERNET BRIDGE
-M:      Stephen Hemminger <shemminger@vyatta.com>
+M:      Stephen Hemminger <stephen@networkplumber.org>
 L:      bridge@lists.linux-foundation.org
 L:      netdev@vger.kernel.org
 W:      http://www.linuxfoundation.org/en/Net:Bridge
@@ -3186,9 +3186,9 @@ F:	include/uapi/video/
 F:      include/uapi/linux/fb.h
 
 FREESCALE DIU FRAMEBUFFER DRIVER
-M:      Timur Tabi <timur@freescale.com>
+M:      Timur Tabi <timur@tabi.org>
 L:      linux-fbdev@vger.kernel.org
-S:      Supported
+S:      Maintained
 F:      drivers/video/fsl-diu-fb.*
 
 FREESCALE DMA DRIVER
@@ -3223,9 +3223,8 @@ F:	drivers/net/ethernet/freescale/fs_enet/
 F:      include/linux/fs_enet_pd.h
 
 FREESCALE QUICC ENGINE LIBRARY
-M:      Timur Tabi <timur@freescale.com>
 L:      linuxppc-dev@lists.ozlabs.org
-S:      Supported
+S:      Orphan
 F:      arch/powerpc/sysdev/qe_lib/
 F:      arch/powerpc/include/asm/*qe.h
 
@@ -3244,16 +3243,16 @@ S:	Maintained
 F:      drivers/net/ethernet/freescale/ucc_geth*
 
 FREESCALE QUICC ENGINE UCC UART DRIVER
-M:      Timur Tabi <timur@freescale.com>
+M:      Timur Tabi <timur@tabi.org>
 L:      linuxppc-dev@lists.ozlabs.org
-S:      Supported
+S:      Maintained
 F:      drivers/tty/serial/ucc_uart.c
 
 FREESCALE SOC SOUND DRIVERS
-M:      Timur Tabi <timur@freescale.com>
+M:      Timur Tabi <timur@tabi.org>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 L:      linuxppc-dev@lists.ozlabs.org
-S:      Supported
+S:      Maintained
 F:      sound/soc/fsl/fsl*
 F:      sound/soc/fsl/mpc8610_hpcd.c
 
@@ -4901,7 +4900,7 @@ S:	Maintained
 
 MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
 M:      Mirko Lindner <mlindner@marvell.com>
-M:      Stephen Hemminger <shemminger@vyatta.com>
+M:      Stephen Hemminger <stephen@networkplumber.org>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ethernet/marvell/sk*
@@ -5176,7 +5175,7 @@ S:	Supported
 F:      drivers/infiniband/hw/nes/
 
 NETEM NETWORK EMULATOR
-M:      Stephen Hemminger <shemminger@vyatta.com>
+M:      Stephen Hemminger <stephen@networkplumber.org>
 L:      netem@lists.linux-foundation.org
 S:      Maintained
 F:      net/sched/sch_netem.c
@@ -6574,7 +6573,7 @@ F:	drivers/media/platform/s3c-camif/
 F:      include/media/s3c_camif.h
 
 SERIAL DRIVERS
-M:      Alan Cox <alan@linux.intel.com>
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-serial@vger.kernel.org
 S:      Maintained
 F:      drivers/tty/serial