Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-drm-fsl-dcu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9ea954ace2ffabdb21b45de731517261be3605fa..93a338daedd83b5168bf891a85305167043dd124 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1002,14 +1002,12 @@ L:      cycsyn-devel@bazar.conectiva.com.br
 S:     Maintained
 
 CYCLADES ASYNC MUX DRIVER
-M:     async@cyclades.com
 W:     http://www.cyclades.com/
-S:     Supported
+S:     Orphan
 
 CYCLADES PC300 DRIVER
-M:     pc300@cyclades.com
 W:     http://www.cyclades.com/
-S:     Supported
+S:     Orphan
 
 DAMA SLAVE for AX.25
 P:     Joerg Reuter
@@ -2525,6 +2523,12 @@ M:       olof@lixom.net
 L:     netdev@vger.kernel.org
 S:     Maintained
 
+PA SEMI SMBUS DRIVER
+P:     Olof Johansson
+M:     olof@lixom.net
+L:     i2c@lm-sensors.org
+S:     Maintained
+
 PARALLEL PORT SUPPORT
 P:     Phil Blundell
 M:     philb@gnu.org