Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
  ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
  ALSA: hda - Keep EAPD turned on for old Conexant chips
  ALSA: hda/realtek - Fix missing volume controls with ALC260
  ASoC: wm8940: Properly set codec->dapm.bias_level
  ALSA: hda - Fix pin-config for ASUS W90V
  ALSA: hda - Fix surround/CLFE headphone and speaker pins order
  ALSA: hda - Fix typo
  ALSA: Update the sound git tree URL
  ALSA: HDA: Add new revision for ALC662
  ASoC: max98095: Convert codec->hw_write to snd_soc_write
  ASoC: keep pointer to resource so it can be freed
  ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
  ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
  ASoC: da7210: Add support for line out and DAC
  ASoC: da7210: Add support for DAPM
  ALSA: hda/realtek - Fix DAC assignments of multiple speakers
  ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
  ASoC: Set sgtl5000->ldo in ldo_regulator_register
  ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
  ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
  ...

1 files changed, 3 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 506fe49a4c78..07e5dbd14273 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -529,6 +529,7 @@ S:	Maintained
 F:      drivers/infiniband/hw/amso1100/
 
 ANALOG DEVICES INC ASOC CODEC DRIVERS
+M:      Lars-Peter Clausen <lars@metafoo.de>
 L:      device-drivers-devel@blackfin.uclinux.org
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:      http://wiki.analog.com/
@@ -6038,7 +6039,7 @@ M:	Jaroslav Kysela <perex@perex.cz>
 M:      Takashi Iwai <tiwai@suse.de>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:      http://www.alsa-project.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 T:      git git://git.alsa-project.org/alsa-kernel.git
 S:      Maintained
 F:      Documentation/sound/
@@ -7259,6 +7260,7 @@ T:	git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 W:      http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
 S:      Supported
 F:      Documentation/hwmon/wm83??
+F:      arch/arm/mach-s3c64xx/mach-crag6410*
 F:      drivers/leds/leds-wm83*.c
 F:      drivers/input/misc/wm831x-on.c
 F:      drivers/input/touchscreen/wm831x-ts.c