diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-19 15:13:45 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-19 15:13:45 -0400 |
commit | 23b6b0e3e8306ce3d00e0c87196bfaad335b9096 (patch) | |
tree | 3e690e564ac42444937b0d66b624c0e292d4a88a /MAINTAINERS | |
parent | 8624a1c93772d24a38ed10cfcd290e8a18ac5b0a (diff) | |
parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 10 |
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 | |||
416 | ATM | 416 | ATM |
417 | P: Chas Williams | 417 | P: Chas Williams |
418 | M: chas@cmf.nrl.navy.mil | 418 | M: chas@cmf.nrl.navy.mil |
419 | L: linux-atm-general@lists.sourceforge.net | 419 | L: linux-atm-general@lists.sourceforge.net (subscribers-only) |
420 | W: http://linux-atm.sourceforge.net | 420 | W: http://linux-atm.sourceforge.net |
421 | S: Maintained | 421 | S: Maintained |
422 | 422 | ||
@@ -2828,6 +2828,14 @@ M: hadi@cyberus.ca | |||
2828 | L: netdev@vger.kernel.org | 2828 | L: netdev@vger.kernel.org |
2829 | S: Maintained | 2829 | S: Maintained |
2830 | 2830 | ||
2831 | TCP LOW PRIORITY MODULE | ||
2832 | P: Wong Hoi Sing, Edison | ||
2833 | M: hswong3i@gmail.com | ||
2834 | P: Hung Hing Lun, Mike | ||
2835 | M: hlhung3i@gmail.com | ||
2836 | W: http://tcp-lp-mod.sourceforge.net/ | ||
2837 | S: Maintained | ||
2838 | |||
2831 | TI OMAP RANDOM NUMBER GENERATOR SUPPORT | 2839 | TI OMAP RANDOM NUMBER GENERATOR SUPPORT |
2832 | P: Deepak Saxena | 2840 | P: Deepak Saxena |
2833 | M: dsaxena@plexity.net | 2841 | M: dsaxena@plexity.net |