diff --git a/[refs] b/[refs] index 241065ee555b..bc446178e0f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef1afd4d79f0479960ff36bb5fe6ec6eba1ebff2 +refs/heads/master: 2f39d51981e20d4c81d9b2d374ae823f591c6407 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 558636e3a954..fd2dec1ac464 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -266,6 +266,15 @@ L: linux-acpi@vger.kernel.org W: http://www.lesswatts.org/projects/acpi/ S: Maintained +AD1889 ALSA 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: linux-parisc@vger.kernel.org +S: Maintained + ADM1025 HARDWARE MONITOR DRIVER P: Jean Delvare M: khali@linux-fr.org