Merge branch 'master'

1 files changed, 15 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 900bd58f2dbe..a51d9cfcc2c6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -197,6 +197,15 @@ M:	Thorsten Knabe <linux@thorsten-knabe.de>
 W:      http://linux.thorsten-knabe.de
 S:      Maintained
 
+AD1889 SOUND DRIVER
+P:      Kyle McMartin
+M:      kyle@parisc-linux.org
+P:      Thibaut Varene
+M:      T-Bone@parisc-linux.org
+W:      http://wiki.parisc-linux.org/AD1889
+L:      parisc-linux@lists.parisc-linux.org
+S:      Maintained
+
 ADM1025 HARDWARE MONITOR DRIVER
 P:      Jean Delvare
 M:      khali@linux-fr.org
@@ -2735,6 +2744,12 @@ P:	Roger Luethi
 M:      rl@hellgate.ch
 S:      Maintained
 
+VIAPRO SMBUS DRIVER
+P:      Jean Delvare
+M:      khali@linux-fr.org
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 UCLINUX (AND M68KNOMMU)
 P:      Greg Ungerer
 M:      gerg@uclinux.org