diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-20 15:24:57 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-20 15:24:57 -0400 |
| commit | 5470b462c3f0c6fa980c320968a165bd0f34ca8d (patch) | |
| tree | eb20de947bec8133d27f97f7af8ae4cf35def663 /MAINTAINERS | |
| parent | 4c1d8d0617a39c8325a7c2fd80ac14bf40fd8cc6 (diff) | |
| parent | 0d4e67174b03e3dcfe75ce7ec488770a5d443bf4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fb89be1281c6..86c084321387 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -8500,7 +8500,7 @@ F: drivers/usb/gadget/*uvc*.c | |||
| 8500 | F: drivers/usb/gadget/webcam.c | 8500 | F: drivers/usb/gadget/webcam.c |
| 8501 | 8501 | ||
| 8502 | USB WIRELESS RNDIS DRIVER (rndis_wlan) | 8502 | USB WIRELESS RNDIS DRIVER (rndis_wlan) |
| 8503 | M: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 8503 | M: Jussi Kivilinna <jussi.kivilinna@iki.fi> |
| 8504 | L: linux-wireless@vger.kernel.org | 8504 | L: linux-wireless@vger.kernel.org |
| 8505 | S: Maintained | 8505 | S: Maintained |
| 8506 | F: drivers/net/wireless/rndis_wlan.c | 8506 | F: drivers/net/wireless/rndis_wlan.c |