Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f92707f..df3fa0e 100644 (file)
--- 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
@@ -3908,6 +3914,10 @@ P:       Ion Badulescu
 M:     ionut@cs.columbia.edu
 S:     Maintained
 
+STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
+W:     http://mosquitonet.Stanford.EDU/strip.html
+S:     Unsupported ?
+
 STRADIS MPEG-2 DECODER DRIVER
 P:     Nathan Laredo
 M:     laredo@gnu.org