diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-26 00:50:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-26 00:50:32 +0200 |
| commit | 06dbbfef8296d6dc23e5d8030a0e8e7b20df3b7c (patch) | |
| tree | 9f93c1a56082d80e5741bb2a231e93314efbcd7e /MAINTAINERS | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 (diff) | |
| parent | [IPV4]: Explicitly call fib_get_table() in fib_frontend.c (diff) | |
| download | linux-06dbbfef8296d6dc23e5d8030a0e8e7b20df3b7c.tar.xz linux-06dbbfef8296d6dc23e5d8030a0e8e7b20df3b7c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4]: Explicitly call fib_get_table() in fib_frontend.c
[NET]: Use BUILD_BUG_ON in net/core/flowi.c
[NET]: Remove in-code externs for some functions from net/core/dev.c
[NET]: Don't declare extern variables in net/core/sysctl_net_core.c
[TCP]: Remove unneeded implicit type cast when calling tcp_minshall_update()
[NET]: Treat the sign of the result of skb_headroom() consistently
[9P]: Fix missing unlock before return in p9_mux_poll_start
[PKT_SCHED]: Fix sch_prio.c build with CONFIG_NETDEVICES_MULTIQUEUE
[IPV4] ip_gre: sendto/recvfrom NBMA address
[SCTP]: Consolidate sctp_ulpq_renege_xxx functions
[NETLINK]: Fix ACK processing after netlink_dump_start
[VLAN]: MAINTAINERS update
[DCCP]: Implement SIOCINQ/FIONREAD
[NET]: Validate device addr prior to interface-up
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5862b7860094..f985dfa5941c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4148,6 +4148,12 @@ W: http://linuxtv.org T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git S: Maintained +VLAN (802.1Q) +P: Patrick McHardy +M: kaber@trash.net +L: netdev@vger.kernel.org +S: Maintained + VT1211 HARDWARE MONITOR DRIVER P: Juerg Haefliger M: juergh@gmail.com |