Merge branch 'for-linus' into for-next

Backporting for further works on ca0132 codec driver

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --cc sound/pci/hda/patch_ca0132.c
index 9c0b94ba786ecdd1c7aeda936b78f6c0f8019de2,0a567634e5faddafd470220c7a9ebaff88ce8cef..c40cb63360174f60a0efb13a137592cc04cdc910
--- 1/sound/pci/hda/patch_ca0132.c
--- 2/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@@ -8526,13 -8489,11 +8527,13 @@@ static void ca0132_config(struct hda_co
                break;
        case QUIRK_AE5:
                codec_dbg(codec, "%s: QUIRK_AE5 applied.\n", __func__);
-               snd_hda_apply_pincfgs(codec, r3di_pincfgs);
+               snd_hda_apply_pincfgs(codec, ae5_pincfgs);
                break;
 +      default:
 +              break;
        }
  
 -      switch (spec->quirk) {
 +      switch (ca0132_quirk(spec)) {
        case QUIRK_ALIENWARE:
                spec->num_outputs = 2;
                spec->out_pins[0] = 0x0b; /* speaker out */