aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-19 15:13:45 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-19 15:13:45 -0400
commit23b6b0e3e8306ce3d00e0c87196bfaad335b9096 (patch)
tree3e690e564ac42444937b0d66b624c0e292d4a88a /MAINTAINERS
parent8624a1c93772d24a38ed10cfcd290e8a18ac5b0a (diff)
parent47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff)
Merge branch 'master' into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 9 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d13f98572811..7a08cdbb246a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -416,7 +416,7 @@ S: Supported
416ATM 416ATM
417P: Chas Williams 417P: Chas Williams
418M: chas@cmf.nrl.navy.mil 418M: chas@cmf.nrl.navy.mil
419L: linux-atm-general@lists.sourceforge.net 419L: linux-atm-general@lists.sourceforge.net (subscribers-only)
420W: http://linux-atm.sourceforge.net 420W: http://linux-atm.sourceforge.net
421S: Maintained 421S: Maintained
422 422
@@ -2828,6 +2828,14 @@ M: hadi@cyberus.ca
2828L: netdev@vger.kernel.org 2828L: netdev@vger.kernel.org
2829S: Maintained 2829S: Maintained
2830 2830
2831TCP LOW PRIORITY MODULE
2832P: Wong Hoi Sing, Edison
2833M: hswong3i@gmail.com
2834P: Hung Hing Lun, Mike
2835M: hlhung3i@gmail.com
2836W: http://tcp-lp-mod.sourceforge.net/
2837S: Maintained
2838
2831TI OMAP RANDOM NUMBER GENERATOR SUPPORT 2839TI OMAP RANDOM NUMBER GENERATOR SUPPORT
2832P: Deepak Saxena 2840P: Deepak Saxena
2833M: dsaxena@plexity.net 2841M: dsaxena@plexity.net