diff --git a/[refs] b/[refs] index ad31f110e346..3422e69b2629 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be6a83dd668fb8578456b61d9e16a18d9bc37a65 +refs/heads/master: 4226906361179366c5e33e8c671bfe2706348ed5 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 32aa30d1504a..8c267aa2f6ce 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -292,6 +292,13 @@ L: info-linux@geode.amd.com W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html S: Supported +AOA (Apple Onboard Audio) ALSA DRIVER +P: Johannes Berg +M: johannes@sipsolutions.net +L: linuxppc-dev@ozlabs.org +L: alsa-devel@alsa-project.org +S: Maintained + APM DRIVER P: Stephen Rothwell M: sfr@canb.auug.org.au