Merge http://www.kernel.org/pub/scm/linux/kernel/git/perex/alsa

diff --combined MAINTAINERS
index bac3f70,8c267aa..b6c3c54
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -214,12 -214,6 +214,12 @@@ W:       http://acpi.sourceforge.net
  T:    git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
  S:    Maintained
  
 +ACPI PCI HOTPLUG DRIVER
 +P:    Kristen Carlson Accardi
 +M:    kristen.c.accardi@intel.com
 +L:    pcihpd-discuss@lists.sourceforge.net
 +S:    Maintained
 +
  AD1816 SOUND DRIVER
  P:    Thorsten Knabe
  M:    Thorsten Knabe <linux@thorsten-knabe.de>
@@@ -298,6 -292,13 +298,13 @@@ L:       info-linux@geode.amd.co
  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