diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-04-28 15:16:21 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-04-28 15:16:21 -0400 |
| commit | d53e181c85effdfdec97a760622330626c922d81 (patch) | |
| tree | 9df58cc9a8dd4c752cdc6f11604787a48a8e1238 /MAINTAINERS | |
| parent | d29c9ab1a2c81ce404883baba91e15ae35411900 (diff) | |
| parent | b75a2bf899b668b1d52de8846aafdbcf81349c73 (diff) | |
| download | linux-d53e181c85effdfdec97a760622330626c922d81.tar.gz linux-d53e181c85effdfdec97a760622330626c922d81.tar.bz2 linux-d53e181c85effdfdec97a760622330626c922d81.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into testing/4.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1d5b4becab6f..849133608da7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11071,6 +11071,15 @@ S: Maintained F: drivers/clk/ti/ F: include/linux/clk/ti.h +TI ETHERNET SWITCH DRIVER (CPSW) +M: Mugunthan V N <mugunthanvnm@ti.com> +R: Grygorii Strashko <grygorii.strashko@ti.com> +L: linux-omap@vger.kernel.org +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/ethernet/ti/cpsw* +F: drivers/net/ethernet/ti/davinci* + TI FLASH MEDIA INTERFACE DRIVER M: Alex Dubov <oakad@yahoo.com> S: Maintained |