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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (348 commits)
  ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
  ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
  ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
  ALSA: oxygen: fix Xonar DG input
  ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
  ALSA: hda - Fix missing EAPD for Acer 4930G
  ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
  ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
  ALSA: hda - Don't refer ELD when unplugged
  ASoC: tpa6130a2: Fix compiler warning
  ASoC: tlv320dac33: Add DAPM selection for LOM invert
  ASoC: DMIC codec: Adding a generic DMIC codec
  ALSA: snd-usb-us122l: Fix missing NULL checks
  ALSA: snd-usb-us122l: Fix MIDI output
  ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
  ASoC: Fix section mismatch in wm8995.c
  ALSA: oxygen: add S/PDIF source selection for Claro cards
  ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
  ASoC: fix migor audio build
  ALSA: include delay.h for msleep in Xonar DG support
  ...

diff --cc MAINTAINERS
index 78162c4f9544c0a8fd5f384b3f076909e9dfaf54,be9c708aac7825dbef1bd6ac5ceb4a92fa5f0800..3dd5c6fce989df9f9aa660ac97ffa9540a4232a2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5283,20 -5176,8 +5319,20 @@@ SAMSUNG AUDIO (ASoC) DRIVER
  M:    Jassi Brar <jassi.brar@samsung.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
- F:    sound/soc/s3c24xx
+ F:    sound/soc/samsung
  
 +TIMEKEEPING, NTP
 +M:    John Stultz <johnstul@us.ibm.com>
 +M:    Thomas Gleixner <tglx@linutronix.de>
 +S:    Supported
 +F:    include/linux/clocksource.h
 +F:    include/linux/time.h
 +F:    include/linux/timex.h
 +F:    include/linux/timekeeping.h
 +F:    kernel/time/clocksource.c
 +F:    kernel/time/time*.c
 +F:    kernel/time/ntp.c
 +
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <shijie8@gmail.com>
  M:    Kang Yong <kangyong@telegent.com>

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge

diff --cc drivers/regulator/wm8994-regulator.c
index 594f88eb60c3390b581abda36b7987261826bf65,21fefef02a43a1bd89eb5eb0169c0b4f5eac30ef..35b2958d51064a84950deef280a14603b1e4e0da
--- 1/drivers/regulator/wm8994-regulator.c
--- 2/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@@ -133,10 -136,17 +135,17 @@@ static int wm8994_ldo2_list_voltage(str
        if (selector > WM8994_LDO2_MAX_SELECTOR)
                return -EINVAL;
  
-       return (selector * 100000) + 900000;
+       switch (ldo->wm8994->type) {
+       case WM8994:
+               return (selector * 100000) + 900000;
+       case WM8958:
+               return (selector * 100000) + 1000000;
+       default:
+               return -EINVAL;
+       }
  }
  
 -static int wm8994_ldo2_get_voltage(struct regulator_dev *rdev)
 +static int wm8994_ldo2_get_voltage_sel(struct regulator_dev *rdev)
  {
        struct wm8994_ldo *ldo = rdev_get_drvdata(rdev);
        int val;

diff --cc drivers/video/sh_mobile_hdmi.c
Simple merge

diff --cc sound/core/pcm_native.c
Simple merge

diff --cc sound/soc/codecs/max98088.c
Simple merge

diff --cc sound/soc/samsung/smdk_spdif.c
index 761e02b4a6e0543adb73b2e57bcde090a3b58608,cb2f4d04ab7ec73f716914df7161c83ef97713d1..b5c3fad01bb8cd0a8e1b3efeddf1bf50a1e636db
--- 1/sound/soc/s3c24xx/smdk_spdif.c
--- 2/sound/soc/samsung/smdk_spdif.c
+++ b/sound/soc/samsung/smdk_spdif.c
@@@ -195,17 -193,21 +193,21 @@@ static int __init smdk_init(void
  
        ret = platform_device_add(smdk_snd_spdif_device);
        if (ret)
-               goto err1;
+               goto err3;
  
 -      /* Set audio clock heirachy manually */
 +      /* Set audio clock hierarchy manually */
        ret = set_audio_clock_heirachy(smdk_snd_spdif_device);
        if (ret)
-               goto err1;
+               goto err4;
  
        return 0;
- err1:
+ err4:
+       platform_device_del(smdk_snd_spdif_device);
+ err3:
        platform_device_put(smdk_snd_spdif_device);
  err2:
+       platform_device_del(smdk_snd_spdif_dit_device);
+ err1:
        platform_device_put(smdk_snd_spdif_dit_device);
        return ret;
  }