diff options
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1e7cc42a69ba..29f9948b2cc0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2586,7 +2586,7 @@ S: Maintained | |||
| 2586 | F: drivers/net/ethernet/i825xx/eexpress.* | 2586 | F: drivers/net/ethernet/i825xx/eexpress.* |
| 2587 | 2587 | ||
| 2588 | ETHERNET BRIDGE | 2588 | ETHERNET BRIDGE |
| 2589 | M: Stephen Hemminger <shemminger@linux-foundation.org> | 2589 | M: Stephen Hemminger <shemminger@vyatta.com> |
| 2590 | L: bridge@lists.linux-foundation.org | 2590 | L: bridge@lists.linux-foundation.org |
| 2591 | L: netdev@vger.kernel.org | 2591 | L: netdev@vger.kernel.org |
| 2592 | W: http://www.linuxfoundation.org/en/Net:Bridge | 2592 | W: http://www.linuxfoundation.org/en/Net:Bridge |
| @@ -4473,7 +4473,7 @@ S: Supported | |||
| 4473 | F: drivers/infiniband/hw/nes/ | 4473 | F: drivers/infiniband/hw/nes/ |
| 4474 | 4474 | ||
| 4475 | NETEM NETWORK EMULATOR | 4475 | NETEM NETWORK EMULATOR |
| 4476 | M: Stephen Hemminger <shemminger@linux-foundation.org> | 4476 | M: Stephen Hemminger <shemminger@vyatta.com> |
| 4477 | L: netem@lists.linux-foundation.org | 4477 | L: netem@lists.linux-foundation.org |
| 4478 | S: Maintained | 4478 | S: Maintained |
| 4479 | F: net/sched/sch_netem.c | 4479 | F: net/sched/sch_netem.c |
| @@ -5988,7 +5988,7 @@ S: Maintained | |||
| 5988 | F: drivers/usb/misc/sisusbvga/ | 5988 | F: drivers/usb/misc/sisusbvga/ |
| 5989 | 5989 | ||
| 5990 | SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS | 5990 | SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS |
| 5991 | M: Stephen Hemminger <shemminger@linux-foundation.org> | 5991 | M: Stephen Hemminger <shemminger@vyatta.com> |
| 5992 | L: netdev@vger.kernel.org | 5992 | L: netdev@vger.kernel.org |
| 5993 | S: Maintained | 5993 | S: Maintained |
| 5994 | F: drivers/net/ethernet/marvell/sk* | 5994 | F: drivers/net/ethernet/marvell/sk* |