diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-11 14:48:32 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-11 14:48:32 -0400 |
| commit | 3899ba90a4ab2f3cab8e0f91a76c14ff131c8293 (patch) | |
| tree | ae82b469f8a7ceb42547d11dd1fe5c73abc8635b /MAINTAINERS | |
| parent | 45203a3b380cee28f570475c0d28c169f908c209 (diff) | |
| parent | 8b3e7be437a6b62118d0485ad971e724afe23fdf (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/debug.c
net/mac80211/iface.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f35a259a6564..0518ec49467b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2299,6 +2299,11 @@ M: Jaya Kumar <jayakumar.alsa@gmail.com> | |||
| 2299 | S: Maintained | 2299 | S: Maintained |
| 2300 | F: sound/pci/cs5535audio/ | 2300 | F: sound/pci/cs5535audio/ |
| 2301 | 2301 | ||
| 2302 | CW1200 WLAN driver | ||
| 2303 | M: Solomon Peachy <pizza@shaftnet.org> | ||
| 2304 | S: Maintained | ||
| 2305 | F: drivers/net/wireless/cw1200/ | ||
| 2306 | |||
| 2302 | CX18 VIDEO4LINUX DRIVER | 2307 | CX18 VIDEO4LINUX DRIVER |
| 2303 | M: Andy Walls <awalls@md.metrocast.net> | 2308 | M: Andy Walls <awalls@md.metrocast.net> |
| 2304 | L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) | 2309 | L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) |