Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (212 commits)
  [PATCH] Fix breakage with CONFIG_SYSFS_DEPRECATED
  [ALSA] version 1.0.14rc2
  [ALSA] ASoC documentation updates
  [ALSA] ca0106 - Add missing sysfs device assignment
  [ALSA] aoa i2sbus: Stop Apple i2s DMA gracefully
  [ALSA] hda-codec - Add support for Fujitsu PI1556 Realtek ALC880
  [ALSA] aoa: remove suspend/resume printks
  [ALSA] Fix possible deadlocks in sequencer at removal of ports
  [ALSA] emu10k1 - Fix STAC9758 front channel
  [ALSA] soc - Clean up with kmemdup()
  [ALSA] snd-ak4114: Fix two array overflows
  [ALSA] ac97_bus power management
  [ALSA] usbaudio - Add support for Edirol UA-101
  [ALSA] hda-codec - Add ALC861VD/ALC660VD support
  [ALSA] soc - ASoC 0.13 Sharp poodle machine
  [ALSA] soc - ASoC 0.13 Sharp tosa machine
  [ALSA] soc - ASoC 0.13 spitz machine
  [ALSA] soc - ASoC Sharp corgi machine
  [ALSA] soc - ASoC 0.13 pxa2xx DMA
  [ALSA] soc - ASoC 0.13 pxa2xx AC97 driver
  ...

diff --combined MAINTAINERS
index 6ddae2bb6821b0cd1249a4ef18a5e8f1216dfc10,010658a8b5a06d11a81d61686323e3ccbc8d006f..f2a79481f1c1904479a8f105924e496003cba4d0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1114,7 -1114,7 +1114,7 @@@ S:      Supporte
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  P:    Tobias Ringstrom
  M:    tori@unhappy.mine.nu
 -L:    linux-kernel@vger.kernel.org
 +L:    netdev@vger.kernel.org
  S:    Maintained
  
  DOCBOOK FOR DOCUMENTATION
@@@ -2361,7 -2361,7 +2361,7 @@@ S:      Maintaine
  NETWORKING [WIRELESS]
  P:    John W. Linville
  M:    linville@tuxdriver.com
 -L:    netdev@vger.kernel.org
 +L:    linux-wireless@vger.kernel.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
  S:    Maintained
  
@@@ -3037,6 -3037,12 +3037,12 @@@ M:    perex@suse.c
  L:    alsa-devel@alsa-project.org
  S:    Maintained
  
+ SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
+ P:    Liam Girdwood
+ M:    liam.girdwood@wolfsonmicro.com
+ L:    alsa-devel@alsa-project.org
+ S:    Supported
+ 
  SPI SUBSYSTEM
  P:    David Brownell
  M:    dbrownell@users.sourceforge.net