diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 21:10:23 +0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 21:10:23 +0400 |
commit | a4e0d9af403d099e751797f6cc69e4a8e2d78ef1 (patch) | |
tree | 6f4afdffe5dbaad7529be987b8c3259a07395031 /MAINTAINERS | |
parent | c60f2b5c1defb6b1345968e1c65c2008c221d57d (diff) | |
parent | c010b2f76c3032e48097a6eef291d8593d5d79a6 (diff) | |
download | linux-a4e0d9af403d099e751797f6cc69e4a8e2d78ef1.tar.xz |
Merge ../linux-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ec0c9c914f17..0652ab384d51 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1988,6 +1988,12 @@ M: mikulas@artax.karlin.mff.cuni.cz W: http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi S: Maintained +HTCPEN TOUCHSCREEN DRIVER +P: Pau Oliva Fora +M: pof@eslack.org +L: linux-input@vger.kernel.org +S: Maintained + HUGETLB FILESYSTEM P: William Irwin M: wli@holomorphy.com @@ -3527,7 +3533,7 @@ S: Supported S390 NETWORK DRIVERS P: Ursula Braun -M: ubraun@linux.vnet.ibm.com +M: ursula.braun@de.ibm.com P: Frank Blaschka M: blaschka@linux.vnet.ibm.com M: linux390@de.ibm.com @@ -3547,7 +3553,7 @@ S: Supported S390 IUCV NETWORK LAYER P: Ursula Braun -M: ubraun@linux.vnet.ibm.com +M: ursula.braun@de.ibm.com M: linux390@de.ibm.com L: linux-s390@vger.kernel.org W: http://www.ibm.com/developerworks/linux/linux390/ @@ -4041,9 +4047,10 @@ W: http://www.buzzard.org.uk/toshiba/ S: Maintained TPM DEVICE DRIVER -P: Debora Velarde -P: Rajiv Andrade -M: tpmdd-devel@lists.sourceforge.net +P: Debora Velarde +M: debora@linux.vnet.ibm.com +P: Rajiv Andrade +M: srajiv@linux.vnet.ibm.com W: http://tpmdd.sourceforge.net P: Marcel Selhorst M: tpm@selhorst.net |