diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-09 14:44:44 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-09 14:44:44 -0500 |
| commit | b1109bf085c8dd69537b7876ea83f914dd1fe46a (patch) | |
| tree | 086bd9891a8c92284ea148c93f2242e6c7c02bd2 /MAINTAINERS | |
| parent | 889b8f964f2f226b7cd5a0a515109e3d8d9d1613 (diff) | |
| parent | 44bfce5c3ec91baf8ffcd075c66711740f29a949 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f19e0989a5a2..fe17b8016bcf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3836,6 +3836,7 @@ NETWORKING DRIVERS | |||
| 3836 | L: netdev@vger.kernel.org | 3836 | L: netdev@vger.kernel.org |
| 3837 | W: http://www.linuxfoundation.org/en/Net | 3837 | W: http://www.linuxfoundation.org/en/Net |
| 3838 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git | 3838 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git |
| 3839 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git | ||
| 3839 | S: Odd Fixes | 3840 | S: Odd Fixes |
| 3840 | F: drivers/net/ | 3841 | F: drivers/net/ |
| 3841 | F: include/linux/if_* | 3842 | F: include/linux/if_* |