diff --git a/[refs] b/[refs] index 5ce7ba96f5c2..8a1d3d226b1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97e94c3a57c5999dde878449f17238ae98f74e42 +refs/heads/master: 4bdef3bd7e59a3cabb3dc02ccff9f056d3a06f99 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 433f35385756..a1df54b0af79 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -454,6 +454,17 @@ L: linux-rdma@vger.kernel.org S: Maintained F: drivers/infiniband/hw/amso1100/ +ANALOG DEVICES INC ASOC DRIVERS +L: uclinux-dist-devel@blackfin.uclinux.org +L: alsa-devel@alsa-project.org (moderated for non-subscribers) +W: http://blackfin.uclinux.org/ +S: Supported +F: sound/soc/blackfin/* +F: sound/soc/codecs/ad1* +F: sound/soc/codecs/adau* +F: sound/soc/codecs/adav* +F: sound/soc/codecs/ssm* + AOA (Apple Onboard Audio) ALSA DRIVER M: Johannes Berg L: linuxppc-dev@lists.ozlabs.org