diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-27 05:05:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-27 05:05:54 -0500 |
| commit | ce300c7ffa61165f9bfd16e511ee0cd4114977ab (patch) | |
| tree | 874b57409bad0c9620a431272e6bf5c94e270253 /MAINTAINERS | |
| parent | 8266d7127c1b0bdf924066c19c71be4d351e9583 (diff) | |
| parent | 9e3bd9190800e8209b4a3e1d724c35f0738dcad2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6bd1cd5c60df..e71ff7c67a63 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3502,9 +3502,9 @@ F: drivers/net/mv643xx_eth.* | |||
| 3502 | F: include/linux/mv643xx.h | 3502 | F: include/linux/mv643xx.h |
| 3503 | 3503 | ||
| 3504 | MARVELL MWL8K WIRELESS DRIVER | 3504 | MARVELL MWL8K WIRELESS DRIVER |
| 3505 | M: Lennert Buytenhek <buytenh@marvell.com> | 3505 | M: Lennert Buytenhek <buytenh@wantstofly.org> |
| 3506 | L: linux-wireless@vger.kernel.org | 3506 | L: linux-wireless@vger.kernel.org |
| 3507 | S: Supported | 3507 | S: Maintained |
| 3508 | F: drivers/net/wireless/mwl8k.c | 3508 | F: drivers/net/wireless/mwl8k.c |
| 3509 | 3509 | ||
| 3510 | MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER | 3510 | MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER |