diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-03 05:43:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-03 05:43:41 -0400 |
| commit | b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768 (patch) | |
| tree | 71ae1801d264bca62efa0d22376b49de7f206e9a /MAINTAINERS | |
| parent | d455e5b165a367a628110ec2d18807ea10052cd1 (diff) | |
| parent | 12186be7d2e1106cede1cc728526e3d7998cbe94 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/forcedeth.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 77f277e1b4b9..e18baa410b50 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1545,6 +1545,13 @@ W: http://www.fi.muni.cz/~kas/cosa/ | |||
| 1545 | S: Maintained | 1545 | S: Maintained |
| 1546 | F: drivers/net/wan/cosa* | 1546 | F: drivers/net/wan/cosa* |
| 1547 | 1547 | ||
| 1548 | CPMAC ETHERNET DRIVER | ||
| 1549 | P: Florian Fainelli | ||
| 1550 | M: florian@openwrt.org | ||
| 1551 | L: netdev@vger.kernel.org | ||
| 1552 | S: Maintained | ||
| 1553 | F: drivers/net/cpmac.c | ||
| 1554 | |||
| 1548 | CPU FREQUENCY DRIVERS | 1555 | CPU FREQUENCY DRIVERS |
| 1549 | P: Dave Jones | 1556 | P: Dave Jones |
| 1550 | M: davej@redhat.com | 1557 | M: davej@redhat.com |