Merge branch 'master' into upstream-fixes

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0557cfde053d7d794bda7e6c33c349688f778f50..b2afc7ae965bde912209daaceaff89ed6f1c7bb2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1676,10 +1676,8 @@ L:       linux-kernel@vger.kernel.org
 S:     Maintained
 
 LAPB module
-P:     Henner Eisen
-M:     eis@baty.hanse.de
 L:     linux-x25@vger.kernel.org
-S:     Maintained
+S:     Orphan
 
 LASI 53c700 driver for PARISC
 P:     James E.J. Bottomley
@@ -2240,6 +2238,12 @@ M:       tsbogend@alpha.franken.de
 L:     netdev@vger.kernel.org
 S:     Maintained
 
+PER-TASK DELAY ACCOUNTING
+P:     Shailabh Nagar
+M:     nagar@watson.ibm.com
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 PERSONALITY HANDLING
 P:     Christoph Hellwig
 M:     hch@infradead.org
@@ -2767,6 +2771,12 @@ P:       Deepak Saxena
 M:     dsaxena@plexity.net
 S:     Maintained
 
+TASKSTATS STATISTICS INTERFACE
+P:     Shailabh Nagar
+M:     nagar@watson.ibm.com
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 TI PARALLEL LINK CABLE DRIVER
 P:     Romain Lievin
 M:     roms@lpg.ticalc.org