diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-20 17:59:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-20 17:59:33 -0500 |
| commit | 6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82 (patch) | |
| tree | 54dd0130534a0e20195f45ece12421c604064d01 /MAINTAINERS | |
| parent | a4cc3889f7e2c3f2fd15b492822c889fed5e1800 (diff) | |
| parent | 9cc20b268a5a14f5e57b8ad405a83513ab0d78dc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (86 commits)
ipv4: fix redirect handling
ping: dont increment ICMP_MIB_INERRORS
sky2: fix hang in napi_disable
sky2: enforce minimum ring size
bonding: Don't allow mode change via sysfs with slaves present
f_phonet: fix page offset of first received fragment
stmmac: fix pm functions avoiding sleep on spinlock
stmmac: remove spin_lock in stmmac_ioctl.
stmmac: parameters auto-tuning through HW cap reg
stmmac: fix advertising 1000Base capabilties for non GMII iface
stmmac: use mdelay on timeout of sw reset
sky2: version 1.30
sky2: used fixed RSS key
sky2: reduce default Tx ring size
sky2: rename up/down functions
sky2: pci posting issues
sky2: fix hang on shutdown (and other irq issues)
r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list
MAINTAINERS: change email address for shemminger
pch_gbe: Move #include of module.h
...
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* |