Merge branch 'fix/hda' into topic/hda

diff --cc sound/pci/hda/patch_conexant.c
index 0aa122e,d8213e2..c8e83f5
--- 1/sound/pci/hda/patch_conexant.c
--- 2/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@@ -2973,8 -2846,8 +2973,9 @@@ static struct snd_pci_quirk cxt5066_cfg
        SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),
        SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5),
        SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),
+       SND_PCI_QUIRK(0x17aa, 0x21b2, "Thinkpad X100e", CXT5066_IDEAPAD),
        SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD),
 +      SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),
        {}
  };
  

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