diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-17 13:10:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-17 13:10:35 +1100 |
| commit | 7785cd5694943cdcc610cd1fe3c09cce71af7f9a (patch) | |
| tree | d565711fb4bfeda63309566aaf249155c6f6af84 /MAINTAINERS | |
| parent | 5f10f29fed229ab0b061a9bb4a602e084eba65e3 (diff) | |
| parent | 3fd434d846a2c87f8f705b6876f81e4053f93749 (diff) | |
Merge remote branch 'net/master'
Conflicts:
drivers/net/can/Kconfig
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 313d594dd1d3..445c393aa007 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1111,7 +1111,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 @@ -3741,9 +3740,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/ |