diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-20 00:25:59 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-20 00:25:59 +0100 |
| commit | caf8394524fdc039b090cd3af99157e9e76f4f06 (patch) | |
| tree | c58af82b15459a55a66bfae3a9d83a23c2d2c62c /MAINTAINERS | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | net: fix kernel-doc for sk_filter_rcu_release (diff) | |
| download | linux-caf8394524fdc039b090cd3af99157e9e76f4f06.tar.xz linux-caf8394524fdc039b090cd3af99157e9e76f4f06.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (31 commits)
net: fix kernel-doc for sk_filter_rcu_release
be2net: Fix to avoid firmware update when interface is not open.
netfilter: fix IP_VS dependencies
net: irda: irttp: sync error paths of data- and udata-requests
ipv6: Expose reachable and retrans timer values as msecs
ipv6: Expose IFLA_PROTINFO timer values in msecs instead of jiffies
3c59x: fix build failure on !CONFIG_PCI
ipg.c: remove id [SUNDANCE, 0x1021]
net: caif: spi: fix potential NULL dereference
ath9k_htc: Avoid setting QoS control for non-QoS frames
net: zero kobject in rx_queue_release
net: Fix duplicate volatile warning.
MAINTAINERS: Add stmmac maintainer
bonding: fix a race in IGMP handling
cfg80211: fix can_beacon_sec_chan, reenable HT40
gianfar: fix signedness issue
net: bnx2x: fix error value sign
8139cp: fix checksum broken
r8169: fix checksum broken
rds: Integer overflow in RDS cmsg handling
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f51ec0a22ff9..a92c994ba935 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1829,6 +1829,13 @@ W: http://www.chelsio.com S: Supported F: drivers/net/cxgb4vf/ +STMMAC ETHERNET DRIVER +M: Giuseppe Cavallaro <peppe.cavallaro@st.com> +L: netdev@vger.kernel.org +W: http://www.stlinux.com +S: Supported +F: drivers/net/stmmac/ + CYBERPRO FB DRIVER M: Russell King <linux@arm.linux.org.uk> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |