diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-01-05 16:06:25 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-05 16:06:25 -0500 |
| commit | c96e96354a6c9456cdf1f150eca504e2ea35301e (patch) | |
| tree | 751bec601fb8152116b8e31e0f1f83d687a37d6f /MAINTAINERS | |
| parent | dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a (diff) | |
| parent | 33af88138b859f515b365a074e0a014d7cdbf846 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
net/bluetooth/Makefile
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aa835f7c97d8..2424699364fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5053,7 +5053,7 @@ L: linux-wireless@vger.kernel.org | |||
| 5053 | W: http://linuxwireless.org/ | 5053 | W: http://linuxwireless.org/ |
| 5054 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git | 5054 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git |
| 5055 | S: Maintained | 5055 | S: Maintained |
| 5056 | F: drivers/net/wireless/rtl818x/rtl8180* | 5056 | F: drivers/net/wireless/rtl818x/rtl8180/ |
| 5057 | 5057 | ||
| 5058 | RTL8187 WIRELESS DRIVER | 5058 | RTL8187 WIRELESS DRIVER |
| 5059 | M: Herton Ronaldo Krzesinski <herton@mandriva.com.br> | 5059 | M: Herton Ronaldo Krzesinski <herton@mandriva.com.br> |
| @@ -5063,7 +5063,7 @@ L: linux-wireless@vger.kernel.org | |||
| 5063 | W: http://linuxwireless.org/ | 5063 | W: http://linuxwireless.org/ |
| 5064 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git | 5064 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git |
| 5065 | S: Maintained | 5065 | S: Maintained |
| 5066 | F: drivers/net/wireless/rtl818x/rtl8187* | 5066 | F: drivers/net/wireless/rtl818x/rtl8187/ |
| 5067 | 5067 | ||
| 5068 | RTL8192CE WIRELESS DRIVER | 5068 | RTL8192CE WIRELESS DRIVER |
| 5069 | M: Larry Finger <Larry.Finger@lwfinger.net> | 5069 | M: Larry Finger <Larry.Finger@lwfinger.net> |