diff options
| author | Mark Einon <mark.einon@gmail.com> | 2014-09-30 22:29:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-03 12:22:19 -0700 |
| commit | 38df6492eb511d2a6823303cb1a194c4fe423154 (patch) | |
| tree | 178f95aa9898127f5dc16a9635db59dfe558a5e6 /MAINTAINERS | |
| parent | 739e4a758e0e2930f4bcdddd244254bae8dd7499 (diff) | |
et131x: Add PCIe gigabit ethernet driver et131x to drivers/net
This adds the ethernet driver for Agere et131x devices to
drivers/net/ethernet.
The driver being added has been in the staging tree for some time, and will be
removed from there in a seperate patch. This one merely disables the staging
version to prevent two instances being built.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c2e7a06c585b..78b9f3b77a87 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3550,6 +3550,11 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git F: drivers/video/fbdev/s1d13xxxfb.c F: include/video/s1d13xxxfb.h +ET131X NETWORK DRIVER +M: Mark Einon <mark.einon@gmail.com> +S: Odd Fixes +F: drivers/net/ethernet/agere/ + ETHERNET BRIDGE M: Stephen Hemminger <stephen@networkplumber.org> L: bridge@lists.linux-foundation.org @@ -8694,11 +8699,6 @@ M: H Hartley Sweeten <hsweeten@visionengravers.com> S: Odd Fixes F: drivers/staging/comedi/ -STAGING - ET131X NETWORK DRIVER -M: Mark Einon <mark.einon@gmail.com> -S: Odd Fixes -F: drivers/staging/et131x/ - STAGING - FLARION FT1000 DRIVERS M: Marek Belisko <marek.belisko@gmail.com> S: Odd Fixes |