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 4808256446f2..aa11a574e74e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2576,7 +2576,7 @@ S: Maintained | |||
2576 | F: drivers/net/ethernet/i825xx/eexpress.* | 2576 | F: drivers/net/ethernet/i825xx/eexpress.* |
2577 | 2577 | ||
2578 | ETHERNET BRIDGE | 2578 | ETHERNET BRIDGE |
2579 | M: Stephen Hemminger <shemminger@linux-foundation.org> | 2579 | M: Stephen Hemminger <shemminger@vyatta.com> |
2580 | L: bridge@lists.linux-foundation.org | 2580 | L: bridge@lists.linux-foundation.org |
2581 | L: netdev@vger.kernel.org | 2581 | L: netdev@vger.kernel.org |
2582 | W: http://www.linuxfoundation.org/en/Net:Bridge | 2582 | W: http://www.linuxfoundation.org/en/Net:Bridge |
@@ -4462,7 +4462,7 @@ S: Supported | |||
4462 | F: drivers/infiniband/hw/nes/ | 4462 | F: drivers/infiniband/hw/nes/ |
4463 | 4463 | ||
4464 | NETEM NETWORK EMULATOR | 4464 | NETEM NETWORK EMULATOR |
4465 | M: Stephen Hemminger <shemminger@linux-foundation.org> | 4465 | M: Stephen Hemminger <shemminger@vyatta.com> |
4466 | L: netem@lists.linux-foundation.org | 4466 | L: netem@lists.linux-foundation.org |
4467 | S: Maintained | 4467 | S: Maintained |
4468 | F: net/sched/sch_netem.c | 4468 | F: net/sched/sch_netem.c |
@@ -5977,7 +5977,7 @@ S: Maintained | |||
5977 | F: drivers/usb/misc/sisusbvga/ | 5977 | F: drivers/usb/misc/sisusbvga/ |
5978 | 5978 | ||
5979 | SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS | 5979 | SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS |
5980 | M: Stephen Hemminger <shemminger@linux-foundation.org> | 5980 | M: Stephen Hemminger <shemminger@vyatta.com> |
5981 | L: netdev@vger.kernel.org | 5981 | L: netdev@vger.kernel.org |
5982 | S: Maintained | 5982 | S: Maintained |
5983 | F: drivers/net/ethernet/marvell/sk* | 5983 | F: drivers/net/ethernet/marvell/sk* |