diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-22 14:27:21 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-22 14:27:21 -0500 |
| commit | 63e35cd9bd4c8ae085c8b9a70554595b529c4100 (patch) | |
| tree | 68e771e0035d5f3ee394a3d86885631a2610bba5 /MAINTAINERS | |
| parent | 503b1a529a6b62b31904bab4699752c523cf76b2 (diff) | |
| parent | 3d986b25b5faa50ba6afd94f60f270b6c3061e5e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f5630a5b3f49..52d5d9739a08 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5062,6 +5062,16 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.g | |||
| 5062 | S: Maintained | 5062 | S: Maintained |
| 5063 | F: drivers/net/wireless/rtl818x/rtl8187* | 5063 | F: drivers/net/wireless/rtl818x/rtl8187* |
| 5064 | 5064 | ||
| 5065 | RTL8192CE WIRELESS DRIVER | ||
| 5066 | M: Larry Finger <Larry.Finger@lwfinger.net> | ||
| 5067 | M: Chaoming Li <chaoming_li@realsil.com.cn> | ||
| 5068 | L: linux-wireless@vger.kernel.org | ||
| 5069 | W: http://linuxwireless.org/ | ||
| 5070 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git | ||
| 5071 | S: Maintained | ||
| 5072 | F: drivers/net/wireless/rtlwifi/ | ||
| 5073 | F: drivers/net/wireless/rtlwifi/rtl8192ce/ | ||
| 5074 | |||
| 5065 | S3 SAVAGE FRAMEBUFFER DRIVER | 5075 | S3 SAVAGE FRAMEBUFFER DRIVER |
| 5066 | M: Antonino Daplas <adaplas@gmail.com> | 5076 | M: Antonino Daplas <adaplas@gmail.com> |
| 5067 | L: linux-fbdev@vger.kernel.org | 5077 | L: linux-fbdev@vger.kernel.org |