Merge branch 'for-linus' into for-next

Need to merge the fixes regarding EPSS.

Conflicts:
	sound/pci/hda/hda_codec.c

diff --cc sound/pci/hda/hda_codec.c
index 5f9da87d8762c8b9f3b5663819b1c742ca819951,f25c24c743f9d7dedd551d2196c2f1e441076a07..1b35115f7195aa4bbaca34f4d56bccc2646f15e0
--- 1/sound/pci/hda/hda_codec.c
--- 2/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@@ -1320,13 -1320,9 +1320,16 @@@ int /*__devinit*/ snd_hda_codec_new(str
                                           AC_VERB_GET_SUBSYSTEM_ID, 0);
        }
  
 +#ifdef CONFIG_SND_HDA_POWER_SAVE
 +      codec->d3_stop_clk = snd_hda_codec_get_supported_ps(codec,
 +                                      codec->afg ? codec->afg : codec->mfg,
 +                                      AC_PWRST_CLKSTOP);
 +      if (!codec->d3_stop_clk)
 +              bus->power_keep_link_on = 1;
 +#endif
+       codec->epss = snd_hda_codec_get_supported_ps(codec,
+                                       codec->afg ? codec->afg : codec->mfg,
+                                       AC_PWRST_EPSS);
  
        /* power-up all before initialization */
        hda_set_power_state(codec,

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

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