summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-11-13 08:48:19 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-11-13 08:48:19 +0100
commitd478091a3b84eb34bda52c48e9ddfb2d0798558e (patch)
tree7e28f000b31429a183c35f4ff6a0e3ddcc340264 /MAINTAINERS
parenta44e44a6da8fde8b3a24435fe6644d6cafb8ed2d (diff)
parent69ac74822277fa999a3f469d8362e93262deb3f4 (diff)
Merge branch 'for-linus' into for-next
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1371648c0aa8..9a638feba9bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3678,6 +3678,7 @@ L: netdev@vger.kernel.org
W: http://www.linuxfoundation.org/en/Net
W: http://patchwork.ozlabs.org/project/netdev/list/
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: Maintained
F: net/
F: include/net/