diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-26 02:22:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-26 02:22:42 -0500 |
| commit | 04488734806948624dabc4514f96f14cd75b9a50 (patch) | |
| tree | 74f3a3c10a7177a5f86398b83ad7bf0569fe8b89 /MAINTAINERS | |
| parent | 54831a83bfe656c4c54e287c734c6b0ccaa3719b (diff) | |
| parent | c4d49794ff2838038fd9756eae39c39a5a685833 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-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 9b0557a42a9a..2a479c7005b8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3495,9 +3495,9 @@ S: Maintained | |||
| 3495 | F: drivers/net/wireless/libertas/ | 3495 | F: drivers/net/wireless/libertas/ |
| 3496 | 3496 | ||
| 3497 | MARVELL MV643XX ETHERNET DRIVER | 3497 | MARVELL MV643XX ETHERNET DRIVER |
| 3498 | M: Lennert Buytenhek <buytenh@marvell.com> | 3498 | M: Lennert Buytenhek <buytenh@wantstofly.org> |
| 3499 | L: netdev@vger.kernel.org | 3499 | L: netdev@vger.kernel.org |
| 3500 | S: Supported | 3500 | S: Maintained |
| 3501 | F: drivers/net/mv643xx_eth.* | 3501 | F: drivers/net/mv643xx_eth.* |
| 3502 | F: include/linux/mv643xx.h | 3502 | F: include/linux/mv643xx.h |
| 3503 | 3503 | ||