diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 10:46:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 10:46:51 -0400 |
| commit | 3e241ff0c57cb610301009fe8c3b9da4c6877800 (patch) | |
| tree | 9663c4ebd8e431a052675b19585e1cc9471b2ef3 /MAINTAINERS | |
| parent | dc0046c7586da5db7561dd8b8e09b40d29ade5fa (diff) | |
| parent | 29fe1b481283a1bada994a69f65736db4ae6f35f (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: (94 commits)
netfilter: ctnetlink: fix gcc warning during compilation
net/netrom: Fix socket locking
netlabel: Always remove the correct address selector
ucc_geth.c: Fix upsmr setting in RMII mode
8139too: fix HW initial flow
af_iucv: Fix race when queuing incoming iucv messages
af_iucv: Test additional sk states in iucv_sock_shutdown
af_iucv: Reject incoming msgs if RECV_SHUTDOWN is set
af_iucv: fix oops in iucv_sock_recvmsg() for MSG_PEEK flag
af_iucv: consider state IUCV_CLOSING when closing a socket
iwlwifi: DMA fixes
iwlwifi: add debugging for TX path
mwl8: fix build warning.
mac80211: fix alignment calculation bug
mac80211: do not print WARN if config interface
iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll
iwlwifi: fix EEPROM validation mask to include OTP only devices
atmel: fix netdev ops conversion
pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM
mlx4_en: Fix cleanup if workqueue create in mlx4_en_add() fails
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 698c4608c715..d58027ed1349 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3991,8 +3991,8 @@ NETWORKING [GENERAL] | |||
| 3991 | P: David S. Miller | 3991 | P: David S. Miller |
| 3992 | M: davem@davemloft.net | 3992 | M: davem@davemloft.net |
| 3993 | L: netdev@vger.kernel.org | 3993 | L: netdev@vger.kernel.org |
| 3994 | W: http://linux-net.osdl.org/ | 3994 | W: http://www.linuxfoundation.org/en/Net |
| 3995 | T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git | 3995 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git |
| 3996 | S: Maintained | 3996 | S: Maintained |
| 3997 | F: net/ | 3997 | F: net/ |
| 3998 | F: include/net/ | 3998 | F: include/net/ |
| @@ -4033,6 +4033,13 @@ F: net/wireless/ | |||
| 4033 | F: include/net/ieee80211* | 4033 | F: include/net/ieee80211* |
| 4034 | F: include/net/wireless.h | 4034 | F: include/net/wireless.h |
| 4035 | 4035 | ||
| 4036 | NETWORKING DRIVERS | ||
| 4037 | L: netdev@vger.kernel.org | ||
| 4038 | W: http://www.linuxfoundation.org/en/Net | ||
| 4039 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git | ||
| 4040 | S: Odd Fixes | ||
| 4041 | F: drivers/net/ | ||
| 4042 | |||
| 4036 | NETXEN (1/10) GbE SUPPORT | 4043 | NETXEN (1/10) GbE SUPPORT |
| 4037 | P: Dhananjay Phadke | 4044 | P: Dhananjay Phadke |
| 4038 | M: dhananjay@netxen.com | 4045 | M: dhananjay@netxen.com |