diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-01 00:15:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-01 00:15:30 -0400 |
| commit | b75ec3af27bf011a760e2f44eb25a99b6fbb0fb3 (patch) | |
| tree | 89f4fbab2c6194b32a46eb771c4b158585bf0bb5 /MAINTAINERS | |
| parent | e7b63ff115f21ea6c609cbb08f3d489af627af6e (diff) | |
| parent | 523e13455ec9ec4457a5a1d24ff7132949742b70 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b6d822d50781..27b27c0a4a11 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -894,11 +894,12 @@ M: Lennert Buytenhek <kernel@wantstofly.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -ARM/Allwinner A1X SoC support +ARM/Allwinner sunXi SoC support M: Maxime Ripard <maxime.ripard@free-electrons.com> +M: Chen-Yu Tsai <wens@csie.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -N: sun[x4567]i +N: sun[x456789]i ARM/Allwinner SoC Clock Support M: Emilio López <emilio@elopez.com.ar> @@ -4427,6 +4428,14 @@ L: linuxppc-dev@lists.ozlabs.org S: Maintained F: drivers/net/ethernet/freescale/ucc_geth* +FREESCALE eTSEC ETHERNET DRIVER (GIANFAR) +M: Claudiu Manoil <claudiu.manoil@freescale.com> +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/ethernet/freescale/gianfar* +X: drivers/net/ethernet/freescale/gianfar_ptp.c +F: Documentation/devicetree/bindings/net/fsl-tsec-phy.txt + FREESCALE QUICC ENGINE UCC UART DRIVER M: Timur Tabi <timur@tabi.org> L: linuxppc-dev@lists.ozlabs.org @@ -11697,6 +11706,7 @@ F: drivers/tty/serial/zs.* ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR M: Minchan Kim <minchan@kernel.org> M: Nitin Gupta <ngupta@vflare.org> +R: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> L: linux-mm@kvack.org S: Maintained F: mm/zsmalloc.c |