Merge branch 'fix/hda' into topic/hda

Speaker-Out renames are merged.

Conflicts:
	sound/pci/hda/patch_realtek.c

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

diff --cc sound/pci/hda/hda_codec.h
Simple merge

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

diff --cc sound/pci/hda/patch_realtek.c
index e142f6f5c499313abebda0874cc589a2679ee5c7,f286bb8fda1375317589949af5da9a9605bea134..01179d53edcd29e84f68fe208976d9fa4a014165
--- 1/sound/pci/hda/patch_realtek.c
--- 2/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -1854,10 -1847,36 +1854,10 @@@ DEFINE_CAPMIX_NOSRC(3)
  /*
   * slave controls for virtual master
   */
 -static const char * const alc_slave_vols[] = {
 -      "Front Playback Volume",
 -      "Surround Playback Volume",
 -      "Center Playback Volume",
 -      "LFE Playback Volume",
 -      "Side Playback Volume",
 -      "Headphone Playback Volume",
 -      "Speaker Playback Volume",
 -      "Mono Playback Volume",
 -      "Line Out Playback Volume",
 -      "CLFE Playback Volume",
 -      "Bass Speaker Playback Volume",
 -      "PCM Playback Volume",
 -      NULL,
 -};
 -
 -static const char * const alc_slave_sws[] = {
 -      "Front Playback Switch",
 -      "Surround Playback Switch",
 -      "Center Playback Switch",
 -      "LFE Playback Switch",
 -      "Side Playback Switch",
 -      "Headphone Playback Switch",
 -      "Speaker Playback Switch",
 -      "Mono Playback Switch",
 -      "IEC958 Playback Switch",
 -      "Line Out Playback Switch",
 -      "CLFE Playback Switch",
 -      "Bass Speaker Playback Switch",
 -      "PCM Playback Switch",
 +static const char * const alc_slave_pfxs[] = {
 +      "Front", "Surround", "Center", "LFE", "Side",
-       "Headphone", "Speaker", "Mono", "Line-Out",
++      "Headphone", "Speaker", "Mono", "Line Out",
 +      "CLFE", "Bass Speaker", "PCM",
        NULL,
  };
  

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