diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 13:52:37 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 13:52:37 +1100 |
| commit | 38c2d1dbb9015aaca8e8c85c62755061ace94e1b (patch) | |
| tree | 8ea1d7d9c254cfb94733b445ac4db8cc243aeeca /MAINTAINERS | |
| parent | 509d06525b5391d731a9372edc089fc98f3b1d38 (diff) | |
| parent | 4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905 (diff) | |
Merge remote branch 'net/master'
Conflicts:
drivers/ieee802154/fakehard.c
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/phy.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/wireless/ath/ath9k/main.c
net/wireless/wext.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7064e81a6d7c..5091dfda2851 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1133,7 +1133,6 @@ F: include/net/ax25.h F: net/ax25/ B43 WIRELESS DRIVER -M: Michael Buesch <mb@bu3sch.de> M: Stefano Brivio <stefano.brivio@polimi.it> L: linux-wireless@vger.kernel.org W: http://linuxwireless.org/en/users/Drivers/b43 @@ -3768,9 +3767,9 @@ F: include/linux/if_* F: include/linux/*device.h NETXEN (1/10) GbE SUPPORT -M: Dhananjay Phadke <dhananjay@netxen.com> +M: Amit Kumar Salecha <amit.salecha@qlogic.com> L: netdev@vger.kernel.org -W: http://www.netxen.com +W: http://www.qlogic.com S: Supported F: drivers/net/netxen/ |