diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-09 20:44:44 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-09 20:44:44 +0100 |
commit | b1109bf085c8dd69537b7876ea83f914dd1fe46a (patch) | |
tree | 086bd9891a8c92284ea148c93f2242e6c7c02bd2 /MAINTAINERS | |
parent | packet: Kill CONFIG_PACKET_MMAP. (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma... (diff) | |
download | linux-b1109bf085c8dd69537b7876ea83f914dd1fe46a.tar.xz linux-b1109bf085c8dd69537b7876ea83f914dd1fe46a.zip |
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 L: netdev@vger.kernel.org W: http://www.linuxfoundation.org/en/Net T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git S: Odd Fixes F: drivers/net/ F: include/linux/if_* |