diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-08 15:39:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-08 15:39:28 -0400 |
| commit | e9a68707d736f4f73d7e209885d7b4c5c452b1dc (patch) | |
| tree | d9f76964c77c1059483b08436ed060b702b8e25d /MAINTAINERS | |
| parent | dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44 (diff) | |
| parent | 15a6321d1c0f8db561932cd99e1b9897981da71f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ipw2x00/ipw2200.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9ddb5ac923cd..51bfd5e856e2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6431,7 +6431,7 @@ WL1271 WIRELESS DRIVER | |||
| 6431 | M: Luciano Coelho <luciano.coelho@nokia.com> | 6431 | M: Luciano Coelho <luciano.coelho@nokia.com> |
| 6432 | L: linux-wireless@vger.kernel.org | 6432 | L: linux-wireless@vger.kernel.org |
| 6433 | W: http://wireless.kernel.org | 6433 | W: http://wireless.kernel.org |
| 6434 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git | 6434 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git |
| 6435 | S: Maintained | 6435 | S: Maintained |
| 6436 | F: drivers/net/wireless/wl12xx/wl1271* | 6436 | F: drivers/net/wireless/wl12xx/wl1271* |
| 6437 | F: include/linux/wl12xx.h | 6437 | F: include/linux/wl12xx.h |