diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-13 13:14:28 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-13 13:14:28 -0500 |
| commit | f647a52e1576f9c92cc9c02d5756cd0207295a2b (patch) | |
| tree | 9e8e69dd01504fad5523c99d7e125e8ff865b65c /MAINTAINERS | |
| parent | 68536053600425c24aba031c45f053d447eedd9c (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
| download | linux-stable-f647a52e1576f9c92cc9c02d5756cd0207295a2b.tar.gz linux-stable-f647a52e1576f9c92cc9c02d5756cd0207295a2b.tar.bz2 linux-stable-f647a52e1576f9c92cc9c02d5756cd0207295a2b.zip | |
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 63ae89617fc5..53f0bf977369 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8563,12 +8563,11 @@ S: Maintained F: sound/soc/codecs/twl4030* TI WILINK WIRELESS DRIVERS -M: Luciano Coelho <luca@coelho.fi> L: linux-wireless@vger.kernel.org W: http://wireless.kernel.org/en/users/Drivers/wl12xx W: http://wireless.kernel.org/en/users/Drivers/wl1251 T: git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git -S: Maintained +S: Orphan F: drivers/net/wireless/ti/ F: include/linux/wl12xx.h |