Merge branch 'fix/hda' into topic/hda

diff --combined Documentation/sound/alsa/HD-Audio-Models.txt
index f1708b79f9637a39fe2926bd519bb562a789b8d3,a2643cfe793852bc71e4a7cda5bf568fbd2ec11e..75fddb40f4163d44d33166a486094f1c593852a0
--- 1/Documentation/sound/alsa/HD-Audio-Models.txt
--- 2/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@@ -209,6 -209,7 +209,7 @@@ AD1884A / AD1883 / AD1984A / AD1984
    laptop      laptop with HP jack sensing
    mobile      mobile devices with HP jack sensing
    thinkpad    Lenovo Thinkpad X300
+   touchsmart  HP Touchsmart
  
  AD1884
  ======
@@@ -387,7 -388,7 +388,7 @@@ STAC92HD73
  STAC92HD83*
  ===========
    ref         Reference board
 -  mic-ref     Reference board with power managment for ports
 +  mic-ref     Reference board with power management for ports
    dell-s14    Dell laptop
    auto                BIOS setup (default)