Automatic merge with /usr/src/ntfs-2.6.git

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4333b69..65ad825 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -239,6 +239,12 @@ L: linux-usb-devel@lists.sourceforge.net
 W:     http://www.linux-usb.org/SpeedTouch/
 S:     Maintained
 
+ALI1563 I2C DRIVER
+P:     Rudolf Marek
+M:     r.marek@sh.cvut.cz
+L:     sensors@stimpy.netroedge.com
+S:     Maintained
+
 ALPHA PORT
 P:     Richard Henderson
 M:     rth@twiddle.net
@@ -1023,8 +1029,8 @@ W:        http://www.ia64-linux.org/
 S:     Maintained
 
 SN-IA64 (Itanium) SUB-PLATFORM
-P:     Jesse Barnes
-M:     jbarnes@sgi.com
+P:     Greg Edwards
+M:     edwardsg@sgi.com
 L:     linux-altix@sgi.com
 L:     linux-ia64@vger.kernel.org
 W:     http://www.sgi.com/altix
@@ -1699,7 +1705,9 @@ P:        Pavel Roskin
 M:     proski@gnu.org
 P:     David Gibson
 M:     hermes@gibson.dropbear.id.au
-W:     http://www.ozlabs.org/people/dgibson/dldwd
+L:     orinoco-users@lists.sourceforge.net
+L:     orinoco-devel@lists.sourceforge.net
+W:     http://www.nongnu.org/orinoco/
 S:     Maintained
 
 PARALLEL PORT SUPPORT
@@ -2113,6 +2121,13 @@ M:       perex@suse.cz
 L:     alsa-devel@alsa-project.org
 S:     Maintained
 
+TPM DEVICE DRIVER
+P:     Kylene Hall
+M:     kjhall@us.ibm.com
+W:     http://tpmdd.sourceforge.net
+L:     tpmdd-devel@lists.sourceforge.net
+S:     Maintained
+
 UltraSPARC (sparc64):
 P:     David S. Miller
 M:     davem@davemloft.net