diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 11:29:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 11:29:55 -0500 |
| commit | 219ff3ad611ecfe8a2fd29b8c50a5313c9d15383 (patch) | |
| tree | 69a9ad12ed64d0966ec63bb5c4699e3effb5490f /MAINTAINERS | |
| parent | 547598d3a91f11b1f802bf0b122f777c3c22f26d (diff) | |
| parent | 2335f8ec27e125208d8d2d3e257a82862c4977d6 (diff) | |
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: (79 commits)
[X25]: Use proc_create() to setup ->proc_fops first
[WANROUTER]: Use proc_create() to setup ->proc_fops first
[8021Q]: Use proc_create() to setup ->proc_fops first
[IPV4]: Use proc_create() to setup ->proc_fops first
[IPV6]: Use proc_create() to setup ->proc_fops first
[SCTP]: Use proc_create() to setup ->proc_fops first
[PKTGEN]: Use proc_create() to setup ->proc_fops first
[NEIGHBOUR]: Use proc_create() to setup ->proc_fops first
[LLC]: Use proc_create() to setup ->proc_fops first
[IPX]: Use proc_create() to setup ->proc_fops first
[SUNRPC]: Use proc_create() to setup ->proc_fops first
[ATM]: Use proc_create() to setup ->proc_fops first
[SCTP]: Update AUTH structures to match declarations in draft-16.
[SCTP]: Incorrect length was used in SCTP_*_AUTH_CHUNKS socket option
[SCTP]: Clean up naming conventions of sctp protocol/address family registration
[APPLETALK]: Use proc_create() to setup ->proc_fops first
[BNX2X]: add bnx2x to MAINTAINERS
[BNX2X]: update version, remove CVS strings
[BNX2X]: Fix Xmit bugs
[BNX2X]: Prevent PCI queue overflow
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4fc5f0aee6a6..799058754236 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -982,6 +982,12 @@ M: mchan@broadcom.com | |||
| 982 | L: netdev@vger.kernel.org | 982 | L: netdev@vger.kernel.org |
| 983 | S: Supported | 983 | S: Supported |
| 984 | 984 | ||
| 985 | BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER | ||
| 986 | P: Eliezer Tamir | ||
| 987 | M: eliezert@broadcom.com | ||
| 988 | L: netdev@vger.kernel.org | ||
| 989 | S: Supported | ||
| 990 | |||
| 985 | BROADCOM TG3 GIGABIT ETHERNET DRIVER | 991 | BROADCOM TG3 GIGABIT ETHERNET DRIVER |
| 986 | P: Michael Chan | 992 | P: Michael Chan |
| 987 | M: mchan@broadcom.com | 993 | M: mchan@broadcom.com |
| @@ -3886,10 +3892,13 @@ M: trivial@kernel.org | |||
| 3886 | L: linux-kernel@vger.kernel.org | 3892 | L: linux-kernel@vger.kernel.org |
| 3887 | S: Maintained | 3893 | S: Maintained |
| 3888 | 3894 | ||
| 3889 | TULIP NETWORK DRIVER | 3895 | TULIP NETWORK DRIVERS |
| 3890 | L: tulip-users@lists.sourceforge.net | 3896 | P: Grant Grundler |
| 3891 | W: http://sourceforge.net/projects/tulip/ | 3897 | M: grundler@parisc-linux.org |
| 3892 | S: Orphan | 3898 | P: Kyle McMartin |
| 3899 | M: kyle@parisc-linux.org | ||
| 3900 | L: netdev@vger.kernel.org | ||
| 3901 | S: Maintained | ||
| 3893 | 3902 | ||
| 3894 | TUN/TAP driver | 3903 | TUN/TAP driver |
| 3895 | P: Maxim Krasnyansky | 3904 | P: Maxim Krasnyansky |