Merge branch 'fix/hda' into topic/hda

diff --cc Documentation/sound/alsa/ALSA-Configuration.txt
Simple merge

diff --cc include/linux/input.h
Simple merge

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

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

diff --cc sound/pci/hda/patch_sigmatel.c
index 4c851fd,d7c622f..71c3ccf
--- 1/sound/pci/hda/patch_sigmatel.c
--- 2/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@@ -4642,10 -4361,11 +4652,13 @@@ again
                return err;
        }
  
+       if (spec->board_config == STAC_92HD73XX_NO_JD)
+               spec->hp_detect = 0;
+ 
        codec->patch_ops = stac92xx_patch_ops;
  
 +      codec->proc_widget_hook = stac92hd7x_proc_hook;
 +
        return 0;
  }