diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-18 14:39:21 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-18 14:39:21 +0100 |
| commit | 49c87cd1eac1f798c5bad7f7eb809e6df36b6c56 (patch) | |
| tree | 8d6905466a05d6539e06d189cf88b71095ac0a79 /MAINTAINERS | |
| parent | b43: HT-PHY: enable basic TX power setup (diff) | |
| parent | rtlwifi: rtl8192cu: Fix problem that prevents reassociation (diff) | |
| download | linux-49c87cd1eac1f798c5bad7f7eb809e6df36b6c56.tar.xz linux-49c87cd1eac1f798c5bad7f7eb809e6df36b6c56.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/nfc/llcp/llcp.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7f68b5e0ce6b..143507e7f6df 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -114,12 +114,6 @@ Maintainers List (try to look for most precise areas first) ----------------------------------- -3C505 NETWORK DRIVER -M: Philip Blundell <philb@gnu.org> -L: netdev@vger.kernel.org -S: Maintained -F: drivers/net/ethernet/i825xx/3c505* - 3C59X NETWORK DRIVER M: Steffen Klassert <klassert@mathematik.tu-chemnitz.de> L: netdev@vger.kernel.org @@ -2361,12 +2355,6 @@ W: http://www.arm.linux.org.uk/ S: Maintained F: drivers/video/cyber2000fb.* -CYCLADES 2X SYNC CARD DRIVER -M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> -W: http://oops.ghostprotocols.net:81/blog -S: Maintained -F: drivers/net/wan/cycx* - CYCLADES ASYNC MUX DRIVER W: http://www.cyclades.com/ S: Orphan @@ -3067,12 +3055,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git F: drivers/video/s1d13xxxfb.c F: include/video/s1d13xxxfb.h -ETHEREXPRESS-16 NETWORK DRIVER -M: Philip Blundell <philb@gnu.org> -L: netdev@vger.kernel.org -S: Maintained -F: drivers/net/ethernet/i825xx/eexpress.* - ETHERNET BRIDGE M: Stephen Hemminger <stephen@networkplumber.org> L: bridge@lists.linux-foundation.org |