diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-16 00:11:56 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-16 00:11:56 +0400 |
| commit | c64557d666eb62eb5f296c6b93bd0a5525ed1e36 (patch) | |
| tree | 1e25cc32521d06ae876de18bb8e48b3cf9d30808 /MAINTAINERS | |
| parent | 1a63c353c856c9f6d44a533afb6ad6dbbcdea683 (diff) | |
| parent | 0d91f22b75347d9503b17a42b6c74d3f7750acd6 (diff) | |
| download | linux-c64557d666eb62eb5f296c6b93bd0a5525ed1e36.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c539910b1f76..476fb3a123ca 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6461,8 +6461,7 @@ L: linux-wireless@vger.kernel.org W: http://wireless.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git S: Maintained -F: drivers/net/wireless/wl12xx/* -X: drivers/net/wireless/wl12xx/wl1271* +F: drivers/net/wireless/wl1251/* WL1271 WIRELESS DRIVER M: Luciano Coelho <luciano.coelho@nokia.com> |