Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 of HEAD

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 196a31c97524eac2ee9fc5235cb1e92f38ca5c7a..491e034f34755121600f57c7c5012070030f6800 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -601,6 +601,15 @@ W: http://linuxtv.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:     Maintained
 
+CALGARY x86-64 IOMMU
+P:     Muli Ben-Yehuda
+M:     muli@il.ibm.com
+P:     Jon D. Mason
+M:     jdmason@us.ibm.com
+L:     linux-kernel@vger.kernel.org
+L:     discuss@x86-64.org
+S:     Maintained
+
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:     Steve French
 M:     sfrench@samba.org
@@ -2666,6 +2675,11 @@ M:       shemminger@osdl.org
 L:     netdev@vger.kernel.org
 S:     Maintained
 
+SOEKRIS NET48XX LED SUPPORT
+P:     Chris Boot
+M:     bootc@bootc.net
+S:     Maintained
+
 SPARC (sparc32):
 P:     William L. Irwin
 M:     wli@holomorphy.com
@@ -3166,7 +3180,6 @@ S:        Maintained
 W1 DALLAS'S 1-WIRE BUS
 P:     Evgeniy Polyakov
 M:     johnpol@2ka.mipt.ru
-L:     lm-sensors@lm-sensors.org
 S:     Maintained
 
 W83L51xD SD/MMC CARD INTERFACE DRIVER