Merge remote-tracking branch 'sound/for-next'

diff --cc sound/pci/hda/patch_sigmatel.c
index 6d1924c19abfdb41d1dddc27e119630c24995abc,8f6c35753810648ab665f4d62ebd28618b418326..fba0cef1c47fff7a49632bf663402785e5cf24f8
--- 1/sound/pci/hda/patch_sigmatel.c
--- 2/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@@ -3231,10 -3229,8 +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/omap/mcbsp.c
Simple merge

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