Merge tag 'asoc-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

ASoC: Updates for v3.12

- DAPM is now mandatory for CODEC drivers in order to avoid the repeated
  regressions in the special cases for non-DAPM CODECs and make it
  easier to integrate with other components on boards.  All existing
  drivers have had some level of DAPM support added.
- A lot of cleanups in DAPM plus support for maintaining controls in a
  specific state while a DAPM widget all contributed by Lars-Peter Clausen.
- Core helpers for bitbanged AC'97 reset from Markus Pargmann.
- New drivers and support for Analog Devices ADAU1702 and ADAU1401(a),
  Asahi Kasei Microdevices AK4554, Atmel AT91ASM9x5 and WM8904 based
  machines, Freescale S/PDIF and SSI AC'97, Renesas R-Car SoCs, Samsung
  Exynos5420 SoCs, Texas Instruments PCM1681 and PCM1792A and Wolfson
  Microelectronics WM8997.
- Support for building drivers that can support it cross-platform for
  compile test.

diff --cc MAINTAINERS
Simple merge

diff --cc sound/pci/hda/hda_generic.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge

diff --cc sound/pci/hda/patch_sigmatel.c
index 8f6c35753810648ab665f4d62ebd28618b418326,6d1924c19abfdb41d1dddc27e119630c24995abc..fba0cef1c47fff7a49632bf663402785e5cf24f8
--- 1/sound/pci/hda/patch_sigmatel.c
--- 2/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@@ -3229,8 -3231,10 +3232,8 @@@ static const struct hda_fixup stac927x_
        [STAC_DELL_BIOS] = {
                .type = HDA_FIXUP_PINS,
                .v.pins = (const struct hda_pintbl[]) {
 -                      /* configure the analog microphone on some laptops */
 -                      { 0x0c, 0x90a79130 },
                        /* correct the front output jack as a hp out */
-                       { 0x0f, 0x0227011f },
+                       { 0x0f, 0x0221101f },
                        /* correct the front input jack as a mic */
                        { 0x0e, 0x02a79130 },
                        {}

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

diff --cc sound/soc/omap/mcbsp.c
Simple merge

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

diff --cc sound/usb/endpoint.c
Simple merge